Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit cb1626bc0bd2 · 2021-07-04T11:35:31.000+02:00
* 5.2:
  CS fix
  Missing translations from traits
  Fix SkippedTestSuite
  [Console] Fix type annotation on InputInterface::hasArgument()
  Revert "minor #41949 [Console] fix type annotations on InputInterface (nicolas-grekas)"
  [EventDispatcher] Correct the called event listener method case
  Add missing translations for Japanese.
  Revert "bug #41952 [Console] fix handling positional arguments (nicolas-grekas)"
  fix backport
diff --git a/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Security\Http\Tests\RememberMe;
 
+use PHPUnit\Framework\SkippedTestSuiteError;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpFoundation\Request;
@@ -34,7 +35,7 @@ public static function setUpBeforeClass(): void
         try {
             random_bytes(1);
         } catch (\Exception $e) {
-            self::markTestSkipped($e->getMessage());
+            throw new SkippedTestSuiteError($e->getMessage());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Security\Http\Tests\RememberMe;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\SkippedTestSuiteError;`
`14`	`15`	`use PHPUnit\Framework\TestCase;`
`15`	`16`	`use Symfony\Component\HttpFoundation\Cookie;`
`16`	`17`	`use Symfony\Component\HttpFoundation\Request;`
`@@ -34,7 +35,7 @@ public static function setUpBeforeClass(): void`
`34`	`35`	`try {`
`35`	`36`	`random_bytes(1);`
`36`	`37`	`} catch (\Exception $e) {`
`37`		`- self::markTestSkipped($e->getMessage());`
	`38`	`+ throw new SkippedTestSuiteError($e->getMessage());`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`