Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit b46b26f7f8d2 · 2021-07-04T11:28:30.000+02:00
* 4.4:
  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)"
  [Security] Don't skip UserPasswordValidatorTest
  [DI] CS fix
  [Console] fix handling positional arguments
  [Validator] add translation for Vietnamese
  Add Bulgarian translation for the validator
diff --git a/Tests/ResponseFunctionalTest.php b/Tests/ResponseFunctionalTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpFoundation\Tests;
 
+use PHPUnit\Framework\SkippedTestSuiteError;
 use PHPUnit\Framework\TestCase;
 
 class ResponseFunctionalTest extends TestCase
@@ -24,7 +25,7 @@ public static function setUpBeforeClass(): void
             2 => ['file', '/dev/null', 'w'],
         ];
         if (!self::$server = @proc_open('exec '.\PHP_BINARY.' -S localhost:8054', $spec, $pipes, __DIR__.'/Fixtures/response-functional')) {
-            self::markTestSkipped('PHP server unable to start.');
+            throw new SkippedTestSuiteError('PHP server unable to start.');
         }
         sleep(1);
     }
diff --git a/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php b/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
+use PHPUnit\Framework\SkippedTestSuiteError;
 use PHPUnit\Framework\TestCase;
 
 class AbstractSessionHandlerTest extends TestCase
@@ -24,7 +25,7 @@ public static function setUpBeforeClass(): void
             2 => ['file', '/dev/null', 'w'],
         ];
         if (!self::$server = @proc_open('exec '.\PHP_BINARY.' -S localhost:8053', $spec, $pipes, __DIR__.'/Fixtures')) {
-            self::markTestSkipped('PHP server unable to start.');
+            throw new SkippedTestSuiteError('PHP server unable to start.');
         }
         sleep(1);
     }
diff --git a/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php b/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
+use PHPUnit\Framework\SkippedTestSuiteError;
+
 /**
  * @group integration
  */
@@ -19,11 +21,11 @@ class RedisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
     public static function setUpBeforeClass(): void
     {
         if (!class_exists(\RedisCluster::class)) {
-            self::markTestSkipped('The RedisCluster class is required.');
+            throw new SkippedTestSuiteError('The RedisCluster class is required.');
         }
 
         if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
-            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
+            throw new SkippedTestSuiteError('REDIS_CLUSTER_HOSTS env var is not defined.');
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\HttpFoundation\Tests;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\SkippedTestSuiteError;`
`14`	`15`	`use PHPUnit\Framework\TestCase;`
`15`	`16`
`16`	`17`	`class ResponseFunctionalTest extends TestCase`
`@@ -24,7 +25,7 @@ public static function setUpBeforeClass(): void`
`24`	`25`	`2 => ['file', '/dev/null', 'w'],`
`25`	`26`	`];`
`26`	`27`	`if (!self::$server = @proc_open('exec '.\PHP_BINARY.' -S localhost:8054', $spec, $pipes, __DIR__.'/Fixtures/response-functional')) {`
`27`		`- self::markTestSkipped('PHP server unable to start.');`
	`28`	`+ throw new SkippedTestSuiteError('PHP server unable to start.');`
`28`	`29`	`}`
`29`	`30`	`sleep(1);`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\SkippedTestSuiteError;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* @group integration`
`16`	`18`	`*/`
`@@ -19,11 +21,11 @@ class RedisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCase`
`19`	`21`	`public static function setUpBeforeClass(): void`
`20`	`22`	`{`
`21`	`23`	`if (!class_exists(\RedisCluster::class)) {`
`22`		`- self::markTestSkipped('The RedisCluster class is required.');`
	`24`	`+ throw new SkippedTestSuiteError('The RedisCluster class is required.');`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {`
`26`		`- self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');`
	`28`	`+ throw new SkippedTestSuiteError('REDIS_CLUSTER_HOSTS env var is not defined.');`
`27`	`29`	`}`
`28`	`30`	`}`
`29`	`31`