diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTestCase.php b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTestCase.php index 793fa4838baf0..52f9500da0ed7 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTestCase.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTestCase.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Cache\Tests\Adapter; -use PHPUnit\Framework\SkippedTestSuiteError; use Psr\Cache\CacheItemPoolInterface; use Relay\Relay; use Symfony\Component\Cache\Adapter\RedisAdapter; @@ -34,12 +33,12 @@ public function createCachePool(int $defaultLifetime = 0, string $testMethod = n public static function setUpBeforeClass(): void { if (!\extension_loaded('redis')) { - throw new SkippedTestSuiteError('Extension redis required.'); + self::markTestSkipped('Extension redis required.'); } try { (new \Redis())->connect(...explode(':', getenv('REDIS_HOST'))); } catch (\Exception $e) { - throw new SkippedTestSuiteError(getenv('REDIS_HOST').': '.$e->getMessage()); + self::markTestSkipped(getenv('REDIS_HOST').': '.$e->getMessage()); } } diff --git a/src/Symfony/Component/Cache/Tests/Adapter/CouchbaseBucketAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/CouchbaseBucketAdapterTest.php index f496999fec147..c596e66e12ea3 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/CouchbaseBucketAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/CouchbaseBucketAdapterTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Cache\Tests\Adapter; -use PHPUnit\Framework\SkippedTestSuiteError; use Psr\Cache\CacheItemPoolInterface; use Symfony\Component\Cache\Adapter\AbstractAdapter; use Symfony\Component\Cache\Adapter\CouchbaseBucketAdapter; @@ -35,7 +34,7 @@ class CouchbaseBucketAdapterTest extends AdapterTestCase public static function setupBeforeClass(): void { if (!CouchbaseBucketAdapter::isSupported()) { - throw new SkippedTestSuiteError('Couchbase >= 2.6.0 < 3.0.0 is required.'); + self::markTestSkipped('Couchbase >= 2.6.0 < 3.0.0 is required.'); } self::$client = AbstractAdapter::createConnection('couchbase://'.getenv('COUCHBASE_HOST').'/cache', diff --git a/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php index 42bca61b2603a..6728d3979760e 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php @@ -18,7 +18,6 @@ use Doctrine\DBAL\DriverManager; use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory; use Doctrine\DBAL\Schema\Schema; -use PHPUnit\Framework\SkippedTestSuiteError; use Psr\Cache\CacheItemPoolInterface; use Symfony\Component\Cache\Adapter\DoctrineDbalAdapter; use Symfony\Component\Cache\Tests\Fixtures\DriverWrapper; @@ -33,7 +32,7 @@ class DoctrineDbalAdapterTest extends AdapterTestCase public static function setUpBeforeClass(): void { if (!\extension_loaded('pdo_sqlite')) { - throw new SkippedTestSuiteError('Extension pdo_sqlite required.'); + self::markTestSkipped('Extension pdo_sqlite required.'); } self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache'); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php index 22c4d60603db8..c8cb3fbe49466 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Cache\Tests\Adapter; -use PHPUnit\Framework\SkippedTestSuiteError; use Psr\Cache\CacheItemPoolInterface; use Symfony\Component\Cache\Adapter\AbstractAdapter; use Symfony\Component\Cache\Adapter\MemcachedAdapter; @@ -33,14 +32,14 @@ class MemcachedAdapterTest extends AdapterTestCase public static function setUpBeforeClass(): void { if (!MemcachedAdapter::isSupported()) { - throw new SkippedTestSuiteError('Extension memcached > 3.1.5 required.'); + self::markTestSkipped('Extension memcached > 3.1.5 required.'); } self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]); self::$client->get('foo'); $code = self::$client->getResultCode(); if (\Memcached::RES_SUCCESS !== $code && \Memcached::RES_NOTFOUND !== $code) { - throw new SkippedTestSuiteError('Memcached error: '.strtolower(self::$client->getResultMessage())); + self::markTestSkipped('Memcached error: '.strtolower(self::$client->getResultMessage())); } } diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php index 2c44f22c4da31..b7d37d5018069 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Cache\Tests\Adapter; -use PHPUnit\Framework\SkippedTestSuiteError; use Psr\Cache\CacheItemPoolInterface; use Symfony\Component\Cache\Adapter\PdoAdapter; @@ -25,7 +24,7 @@ class PdoAdapterTest extends AdapterTestCase public static function setUpBeforeClass(): void { if (!\extension_loaded('pdo_sqlite')) { - throw new SkippedTestSuiteError('Extension pdo_sqlite required.'); + self::markTestSkipped('Extension pdo_sqlite required.'); } self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache'); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterSentinelTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterSentinelTest.php index c3145b9e27f71..6c86357101fd5 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterSentinelTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterSentinelTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Cache\Tests\Adapter; -use PHPUnit\Framework\SkippedTestSuiteError; use Symfony\Component\Cache\Adapter\AbstractAdapter; /** @@ -22,13 +21,13 @@ class PredisAdapterSentinelTest extends AbstractRedisAdapterTestCase public static function setUpBeforeClass(): void { if (!class_exists(\Predis\Client::class)) { - throw new SkippedTestSuiteError('The Predis\Client class is required.'); + self::markTestSkipped('The Predis\Client class is required.'); } if (!$hosts = getenv('REDIS_SENTINEL_HOSTS')) { - throw new SkippedTestSuiteError('REDIS_SENTINEL_HOSTS env var is not defined.'); + self::markTestSkipped('REDIS_SENTINEL_HOSTS env var is not defined.'); } if (!$service = getenv('REDIS_SENTINEL_SERVICE')) { - throw new SkippedTestSuiteError('REDIS_SENTINEL_SERVICE env var is not defined.'); + self::markTestSkipped('REDIS_SENTINEL_SERVICE env var is not defined.'); } self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['redis_sentinel' => $service, 'class' => \Predis\Client::class]); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php index cb04099346f03..fb9865883effd 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Cache\Tests\Adapter; -use PHPUnit\Framework\SkippedTestSuiteError; use Symfony\Component\Cache\Adapter\RedisAdapter; /** @@ -22,7 +21,7 @@ class PredisRedisClusterAdapterTest extends AbstractRedisAdapterTestCase public static function setUpBeforeClass(): void { if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) { - throw new SkippedTestSuiteError('REDIS_CLUSTER_HOSTS env var is not defined.'); + self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.'); } self::$redis = RedisAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['class' => \Predis\Client::class, 'redis_cluster' => true, 'prefix' => 'prefix_']); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php index a4c2487a00b1f..28fbefebe596d 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Cache\Tests\Adapter; -use PHPUnit\Framework\SkippedTestSuiteError; use Symfony\Component\Cache\Adapter\AbstractAdapter; use Symfony\Component\Cache\Adapter\RedisAdapter; use Symfony\Component\Cache\Exception\InvalidArgumentException; @@ -24,13 +23,13 @@ class RedisAdapterSentinelTest extends AbstractRedisAdapterTestCase public static function setUpBeforeClass(): void { if (!class_exists(\RedisSentinel::class)) { - throw new SkippedTestSuiteError('The RedisSentinel class is required.'); + self::markTestSkipped('The RedisSentinel class is required.'); } if (!$hosts = getenv('REDIS_SENTINEL_HOSTS')) { - throw new SkippedTestSuiteError('REDIS_SENTINEL_HOSTS env var is not defined.'); + self::markTestSkipped('REDIS_SENTINEL_HOSTS env var is not defined.'); } if (!$service = getenv('REDIS_SENTINEL_SERVICE')) { - throw new SkippedTestSuiteError('REDIS_SENTINEL_SERVICE env var is not defined.'); + self::markTestSkipped('REDIS_SENTINEL_SERVICE env var is not defined.'); } self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['redis_sentinel' => $service, 'prefix' => 'prefix_']); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisArrayAdapterTest.php index 58ca31441f5fb..8a05c21197623 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/RedisArrayAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisArrayAdapterTest.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Cache\Tests\Adapter; -use PHPUnit\Framework\SkippedTestSuiteError; - /** * @group integration */ @@ -22,7 +20,7 @@ public static function setUpBeforeClass(): void { parent::setupBeforeClass(); if (!class_exists(\RedisArray::class)) { - throw new SkippedTestSuiteError('The RedisArray class is required.'); + self::markTestSkipped('The RedisArray class is required.'); } self::$redis = new \RedisArray([getenv('REDIS_HOST')], ['lazy_connect' => true]); self::$redis->setOption(\Redis::OPT_PREFIX, 'prefix_'); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisClusterAdapterTest.php index cdfa4f43e1a5a..ebee3200d6bce 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/RedisClusterAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisClusterAdapterTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Cache\Tests\Adapter; -use PHPUnit\Framework\SkippedTestSuiteError; use Psr\Cache\CacheItemPoolInterface; use Symfony\Component\Cache\Adapter\AbstractAdapter; use Symfony\Component\Cache\Adapter\RedisAdapter; @@ -26,10 +25,10 @@ class RedisClusterAdapterTest extends AbstractRedisAdapterTestCase public static function setUpBeforeClass(): void { if (!class_exists(\RedisCluster::class)) { - throw new SkippedTestSuiteError('The RedisCluster class is required.'); + self::markTestSkipped('The RedisCluster class is required.'); } if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) { - throw new SkippedTestSuiteError('REDIS_CLUSTER_HOSTS env var is not defined.'); + self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.'); } self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['lazy' => true, 'redis_cluster' => true]); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterSentinelTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterSentinelTest.php index c52fab66f1f28..91a7da460167f 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterSentinelTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterSentinelTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Cache\Tests\Adapter; -use PHPUnit\Framework\SkippedTestSuiteError; use Relay\Relay; use Relay\Sentinel; use Symfony\Component\Cache\Adapter\AbstractAdapter; @@ -24,13 +23,13 @@ class RelayAdapterSentinelTest extends AbstractRedisAdapterTestCase public static function setUpBeforeClass(): void { if (!class_exists(Sentinel::class)) { - throw new SkippedTestSuiteError('The Relay\Sentinel class is required.'); + self::markTestSkipped('The Relay\Sentinel class is required.'); } if (!$hosts = getenv('REDIS_SENTINEL_HOSTS')) { - throw new SkippedTestSuiteError('REDIS_SENTINEL_HOSTS env var is not defined.'); + self::markTestSkipped('REDIS_SENTINEL_HOSTS env var is not defined.'); } if (!$service = getenv('REDIS_SENTINEL_SERVICE')) { - throw new SkippedTestSuiteError('REDIS_SENTINEL_SERVICE env var is not defined.'); + self::markTestSkipped('REDIS_SENTINEL_SERVICE env var is not defined.'); } self::$redis = AbstractAdapter::createConnection( diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterTest.php index a3dad2b3ade03..dde78f4342fc8 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Cache\Tests\Adapter; -use PHPUnit\Framework\SkippedTestSuiteError; use Relay\Relay; use Symfony\Component\Cache\Adapter\AbstractAdapter; use Symfony\Component\Cache\Adapter\RedisAdapter; @@ -30,7 +29,7 @@ public static function setUpBeforeClass(): void try { new Relay(...explode(':', getenv('REDIS_HOST'))); } catch (\Relay\Exception $e) { - throw new SkippedTestSuiteError(getenv('REDIS_HOST').': '.$e->getMessage()); + self::markTestSkipped(getenv('REDIS_HOST').': '.$e->getMessage()); } self::$redis = AbstractAdapter::createConnection('redis://'.getenv('REDIS_HOST'), ['lazy' => true, 'class' => Relay::class]); self::assertInstanceOf(RelayProxy::class, self::$redis); diff --git a/src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php b/src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php index 5997968468276..803be919fde90 100644 --- a/src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php +++ b/src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Cache\Tests\Traits; -use PHPUnit\Framework\SkippedTestSuiteError; use PHPUnit\Framework\TestCase; use Symfony\Component\Cache\Traits\RedisTrait; @@ -20,7 +19,7 @@ class RedisTraitTest extends TestCase public static function setUpBeforeClass(): void { if (!getenv('REDIS_CLUSTER_HOSTS')) { - throw new SkippedTestSuiteError('REDIS_CLUSTER_HOSTS env var is not defined.'); + self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.'); } } @@ -30,10 +29,10 @@ public static function setUpBeforeClass(): void public function testCreateConnection(string $dsn, string $expectedClass) { if (!class_exists($expectedClass)) { - throw new SkippedTestSuiteError(sprintf('The "%s" class is required.', $expectedClass)); + self::markTestSkipped(sprintf('The "%s" class is required.', $expectedClass)); } if (!getenv('REDIS_CLUSTER_HOSTS')) { - throw new SkippedTestSuiteError('REDIS_CLUSTER_HOSTS env var is not defined.'); + self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.'); } $mock = self::getObjectForTrait(RedisTrait::class); diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php index 0a823fe91d3d7..b7eac0f82a2aa 100644 --- a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php +++ b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php @@ -11,7 +11,6 @@ namespace Symfony\Component\HttpClient\Tests; -use PHPUnit\Framework\SkippedTestSuiteError; use Symfony\Component\HttpClient\Exception\ClientException; use Symfony\Component\HttpClient\Exception\TransportException; use Symfony\Component\HttpClient\Internal\ClientState; @@ -318,7 +317,7 @@ private static function startVulcain(HttpClientInterface $client) } if ('\\' === \DIRECTORY_SEPARATOR) { - throw new SkippedTestSuiteError('Testing with the "vulcain" is not supported on Windows.'); + self::markTestSkipped('Testing with the "vulcain" is not supported on Windows.'); } $process = new Process(['vulcain'], null, [ @@ -335,14 +334,14 @@ private static function startVulcain(HttpClientInterface $client) if (!$process->isRunning()) { if ('\\' !== \DIRECTORY_SEPARATOR && 127 === $process->getExitCode()) { - throw new SkippedTestSuiteError('vulcain binary is missing'); + self::markTestSkipped('vulcain binary is missing'); } if ('\\' !== \DIRECTORY_SEPARATOR && 126 === $process->getExitCode()) { - throw new SkippedTestSuiteError('vulcain binary is not executable'); + self::markTestSkipped('vulcain binary is not executable'); } - throw new SkippedTestSuiteError((new ProcessFailedException($process))->getMessage()); + self::markTestSkipped((new ProcessFailedException($process))->getMessage()); } self::$vulcainStarted = true; diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php index c89adcd3cd4b3..ccda147df6a57 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\HttpFoundation\Tests; -use PHPUnit\Framework\SkippedTestSuiteError; use PHPUnit\Framework\TestCase; class ResponseFunctionalTest extends TestCase @@ -26,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')) { - throw new SkippedTestSuiteError('PHP server unable to start.'); + self::markTestSkipped('PHP server unable to start.'); } sleep(1); } diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php index aabeba9009bd5..27fb57da45907 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler; -use PHPUnit\Framework\SkippedTestSuiteError; use PHPUnit\Framework\TestCase; class AbstractSessionHandlerTest extends TestCase @@ -26,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')) { - throw new SkippedTestSuiteError('PHP server unable to start.'); + self::markTestSkipped('PHP server unable to start.'); } sleep(1); } diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php index 031629501bb11..6a30f558f3ca9 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php @@ -11,8 +11,6 @@ namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler; -use PHPUnit\Framework\SkippedTestSuiteError; - /** * @group integration */ @@ -21,11 +19,11 @@ class RedisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCase public static function setUpBeforeClass(): void { if (!class_exists(\RedisCluster::class)) { - throw new SkippedTestSuiteError('The RedisCluster class is required.'); + self::markTestSkipped('The RedisCluster class is required.'); } if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) { - throw new SkippedTestSuiteError('REDIS_CLUSTER_HOSTS env var is not defined.'); + self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.'); } } diff --git a/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php index 6394cbf2103ad..48a35a731e965 100644 --- a/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Lock\Tests\Store; -use PHPUnit\Framework\SkippedTestSuiteError; use Symfony\Component\Lock\Exception\InvalidTtlException; use Symfony\Component\Lock\Key; use Symfony\Component\Lock\PersistingStoreInterface; @@ -31,7 +30,7 @@ class MemcachedStoreTest extends AbstractStoreTestCase public static function setUpBeforeClass(): void { if (version_compare(phpversion('memcached'), '3.1.6', '<')) { - throw new SkippedTestSuiteError('Extension memcached > 3.1.5 required.'); + self::markTestSkipped('Extension memcached > 3.1.5 required.'); } $memcached = new \Memcached(); @@ -40,7 +39,7 @@ public static function setUpBeforeClass(): void $code = $memcached->getResultCode(); if (\Memcached::RES_SUCCESS !== $code && \Memcached::RES_NOTFOUND !== $code) { - throw new SkippedTestSuiteError('Unable to connect to the memcache host'); + self::markTestSkipped('Unable to connect to the memcache host'); } } diff --git a/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreTest.php index 5cfe08e5a6bbb..68aee049a51d9 100644 --- a/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreTest.php @@ -13,7 +13,6 @@ use MongoDB\Client; use MongoDB\Driver\Exception\ConnectionTimeoutException; -use PHPUnit\Framework\SkippedTestSuiteError; use Symfony\Component\Lock\Exception\InvalidArgumentException; use Symfony\Component\Lock\Key; use Symfony\Component\Lock\PersistingStoreInterface; @@ -33,14 +32,14 @@ class MongoDbStoreTest extends AbstractStoreTestCase public static function setupBeforeClass(): void { if (!class_exists(\MongoDB\Client::class)) { - throw new SkippedTestSuiteError('The mongodb/mongodb package is required.'); + self::markTestSkipped('The mongodb/mongodb package is required.'); } $client = self::getMongoClient(); try { $client->listDatabases(); } catch (ConnectionTimeoutException $e) { - throw new SkippedTestSuiteError('MongoDB server not found.'); + self::markTestSkipped('MongoDB server not found.'); } } diff --git a/src/Symfony/Component/Lock/Tests/Store/PredisStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/PredisStoreTest.php index 00fcd4883ae46..3569e3d1f75e2 100644 --- a/src/Symfony/Component/Lock/Tests/Store/PredisStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/PredisStoreTest.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Lock\Tests\Store; -use PHPUnit\Framework\SkippedTestSuiteError; - /** * @author Jérémy Derussé * @@ -26,7 +24,7 @@ public static function setUpBeforeClass(): void try { $redis->connect(); } catch (\Exception $e) { - throw new SkippedTestSuiteError($e->getMessage()); + self::markTestSkipped($e->getMessage()); } } diff --git a/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php index 93e85301e9d81..add9dbd759ab6 100644 --- a/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Lock\Tests\Store; -use PHPUnit\Framework\SkippedTestSuiteError; - /** * @author Jérémy Derussé * @@ -25,12 +23,12 @@ class RedisArrayStoreTest extends AbstractRedisStoreTestCase public static function setUpBeforeClass(): void { if (!class_exists(\RedisArray::class)) { - throw new SkippedTestSuiteError('The RedisArray class is required.'); + self::markTestSkipped('The RedisArray class is required.'); } try { (new \Redis())->connect(...explode(':', getenv('REDIS_HOST'))); } catch (\Exception $e) { - throw new SkippedTestSuiteError($e->getMessage()); + self::markTestSkipped($e->getMessage()); } } diff --git a/src/Symfony/Component/Lock/Tests/Store/RedisClusterStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RedisClusterStoreTest.php index 1f5be31653638..1584f0d569c91 100644 --- a/src/Symfony/Component/Lock/Tests/Store/RedisClusterStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/RedisClusterStoreTest.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Lock\Tests\Store; -use PHPUnit\Framework\SkippedTestSuiteError; - /** * @author Jérémy Derussé * @@ -25,10 +23,10 @@ class RedisClusterStoreTest extends AbstractRedisStoreTestCase public static function setUpBeforeClass(): void { if (!class_exists(\RedisCluster::class)) { - throw new SkippedTestSuiteError('The RedisCluster class is required.'); + self::markTestSkipped('The RedisCluster class is required.'); } if (!getenv('REDIS_CLUSTER_HOSTS')) { - throw new SkippedTestSuiteError('REDIS_CLUSTER_HOSTS env var is not defined.'); + self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.'); } } diff --git a/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php index 5c3b0f68f7c1b..e826f05c44dbf 100644 --- a/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Lock\Tests\Store; -use PHPUnit\Framework\SkippedTestSuiteError; use Symfony\Component\Lock\Exception\InvalidTtlException; use Symfony\Component\Lock\Store\RedisStore; @@ -31,7 +30,7 @@ public static function setUpBeforeClass(): void try { (new \Redis())->connect(...explode(':', getenv('REDIS_HOST'))); } catch (\Exception $e) { - throw new SkippedTestSuiteError($e->getMessage()); + self::markTestSkipped($e->getMessage()); } } diff --git a/src/Symfony/Component/Lock/Tests/Store/RelayStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RelayStoreTest.php index 56b103be47c11..324336755f526 100644 --- a/src/Symfony/Component/Lock/Tests/Store/RelayStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/RelayStoreTest.php @@ -11,7 +11,6 @@ namespace Store; -use PHPUnit\Framework\SkippedTestSuiteError; use Relay\Relay; use Symfony\Component\Lock\Tests\Store\AbstractRedisStoreTestCase; use Symfony\Component\Lock\Tests\Store\SharedLockStoreTestTrait; @@ -30,7 +29,7 @@ public static function setUpBeforeClass(): void try { new Relay(...explode(':', getenv('REDIS_HOST'))); } catch (\Relay\Exception $e) { - throw new SkippedTestSuiteError($e->getMessage()); + self::markTestSkipped($e->getMessage()); } } diff --git a/src/Symfony/Component/Semaphore/Tests/Store/PredisStoreTest.php b/src/Symfony/Component/Semaphore/Tests/Store/PredisStoreTest.php index cf15d711f0a2d..abb8d52c5668c 100644 --- a/src/Symfony/Component/Semaphore/Tests/Store/PredisStoreTest.php +++ b/src/Symfony/Component/Semaphore/Tests/Store/PredisStoreTest.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Semaphore\Tests\Store; -use PHPUnit\Framework\SkippedTestSuiteError; - /** * @author Jérémy Derussé */ @@ -24,7 +22,7 @@ public static function setUpBeforeClass(): void try { $redis->connect(); } catch (\Exception $e) { - throw new SkippedTestSuiteError($e->getMessage()); + self::markTestSkipped($e->getMessage()); } } diff --git a/src/Symfony/Component/Semaphore/Tests/Store/RedisArrayStoreTest.php b/src/Symfony/Component/Semaphore/Tests/Store/RedisArrayStoreTest.php index a60a8af3c8e8b..9780bb4e4247c 100644 --- a/src/Symfony/Component/Semaphore/Tests/Store/RedisArrayStoreTest.php +++ b/src/Symfony/Component/Semaphore/Tests/Store/RedisArrayStoreTest.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Semaphore\Tests\Store; -use PHPUnit\Framework\SkippedTestSuiteError; - /** * @author Jérémy Derussé * @@ -23,12 +21,12 @@ class RedisArrayStoreTest extends AbstractRedisStoreTestCase public static function setUpBeforeClass(): void { if (!class_exists(\RedisArray::class)) { - throw new SkippedTestSuiteError('The RedisArray class is required.'); + self::markTestSkipped('The RedisArray class is required.'); } try { (new \Redis())->connect(...explode(':', getenv('REDIS_HOST'))); } catch (\Exception $e) { - throw new SkippedTestSuiteError($e->getMessage()); + self::markTestSkipped($e->getMessage()); } } diff --git a/src/Symfony/Component/Semaphore/Tests/Store/RedisClusterStoreTest.php b/src/Symfony/Component/Semaphore/Tests/Store/RedisClusterStoreTest.php index 5f6cfa5459b38..46180eab31603 100644 --- a/src/Symfony/Component/Semaphore/Tests/Store/RedisClusterStoreTest.php +++ b/src/Symfony/Component/Semaphore/Tests/Store/RedisClusterStoreTest.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Semaphore\Tests\Store; -use PHPUnit\Framework\SkippedTestSuiteError; - /** * @author Jérémy Derussé * @@ -23,10 +21,10 @@ class RedisClusterStoreTest extends AbstractRedisStoreTestCase public static function setUpBeforeClass(): void { if (!class_exists(\RedisCluster::class)) { - throw new SkippedTestSuiteError('The RedisCluster class is required.'); + self::markTestSkipped('The RedisCluster class is required.'); } if (!getenv('REDIS_CLUSTER_HOSTS')) { - throw new SkippedTestSuiteError('REDIS_CLUSTER_HOSTS env var is not defined.'); + self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.'); } } diff --git a/src/Symfony/Component/Semaphore/Tests/Store/RedisStoreTest.php b/src/Symfony/Component/Semaphore/Tests/Store/RedisStoreTest.php index 1e64b52814885..a27b5af192142 100644 --- a/src/Symfony/Component/Semaphore/Tests/Store/RedisStoreTest.php +++ b/src/Symfony/Component/Semaphore/Tests/Store/RedisStoreTest.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Semaphore\Tests\Store; -use PHPUnit\Framework\SkippedTestSuiteError; - /** * @author Jérémy Derussé * @@ -30,7 +28,7 @@ public static function setUpBeforeClass(): void try { (new \Redis())->connect(...explode(':', getenv('REDIS_HOST'))); } catch (\Exception $e) { - throw new SkippedTestSuiteError($e->getMessage()); + self::markTestSkipped($e->getMessage()); } } diff --git a/src/Symfony/Component/Semaphore/Tests/Store/RelayStoreTest.php b/src/Symfony/Component/Semaphore/Tests/Store/RelayStoreTest.php index 02b5512f8fdd1..a7db8f8f10cf1 100644 --- a/src/Symfony/Component/Semaphore/Tests/Store/RelayStoreTest.php +++ b/src/Symfony/Component/Semaphore/Tests/Store/RelayStoreTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Semaphore\Tests\Store; -use PHPUnit\Framework\SkippedTestSuiteError; use Relay\Relay; /** @@ -29,7 +28,7 @@ public static function setUpBeforeClass(): void try { new Relay(...explode(':', getenv('REDIS_HOST'))); } catch (\Relay\Exception $e) { - throw new SkippedTestSuiteError($e->getMessage()); + self::markTestSkipped($e->getMessage()); } }