From 6f2aa6d245a645bdddf3c04d7cae2f55ee62930c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= Date: Sun, 23 May 2021 15:08:14 +0200 Subject: [PATCH] Fix SkippedTestSuite --- .../Cache/Tests/Adapter/AbstractRedisAdapterTest.php | 5 +++-- .../Component/Cache/Tests/Adapter/MemcachedAdapterTest.php | 5 +++-- .../Component/Cache/Tests/Adapter/PdoAdapterTest.php | 3 ++- .../Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php | 3 ++- .../Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php | 3 ++- .../Cache/Tests/Adapter/RedisAdapterSentinelTest.php | 7 ++++--- .../Cache/Tests/Adapter/RedisArrayAdapterTest.php | 4 +++- .../Cache/Tests/Adapter/RedisClusterAdapterTest.php | 5 +++-- .../Cache/Tests/Simple/AbstractRedisCacheTest.php | 5 +++-- .../Component/Cache/Tests/Simple/MemcachedCacheTest.php | 5 +++-- src/Symfony/Component/Cache/Tests/Simple/PdoCacheTest.php | 3 ++- .../Component/Cache/Tests/Simple/PdoDbalCacheTest.php | 3 ++- .../Component/Cache/Tests/Simple/RedisArrayCacheTest.php | 4 +++- .../Component/Cache/Tests/Simple/RedisClusterCacheTest.php | 6 ++++-- .../HttpFoundation/Tests/ResponseFunctionalTest.php | 3 ++- .../Session/Storage/Handler/AbstractSessionHandlerTest.php | 3 ++- .../Storage/Handler/RedisClusterSessionHandlerTest.php | 6 ++++-- .../Component/Lock/Tests/Store/MemcachedStoreTest.php | 3 ++- src/Symfony/Component/Lock/Tests/Store/PredisStoreTest.php | 4 +++- .../Component/Lock/Tests/Store/RedisArrayStoreTest.php | 6 ++++-- .../Component/Lock/Tests/Store/RedisClusterStoreTest.php | 6 ++++-- src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php | 3 ++- .../Messenger/Tests/Transport/RedisExt/ConnectionTest.php | 5 +++-- .../PersistentTokenBasedRememberMeServicesTest.php | 3 ++- 24 files changed, 67 insertions(+), 36 deletions(-) diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php index 9d14007fde..cb0876d541 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Cache\Tests\Adapter; +use PHPUnit\Framework\SkippedTestSuiteError; use Psr\Cache\CacheItemPoolInterface; use Symfony\Component\Cache\Adapter\RedisAdapter; @@ -32,12 +33,12 @@ abstract class AbstractRedisAdapterTest extends AdapterTestCase public static function setUpBeforeClass(): void { if (!\extension_loaded('redis')) { - self::markTestSkipped('Extension redis required.'); + throw new SkippedTestSuiteError('Extension redis required.'); } try { (new \Redis())->connect(getenv('REDIS_HOST')); } catch (\Exception $e) { - self::markTestSkipped($e->getMessage()); + throw new SkippedTestSuiteError($e->getMessage()); } } diff --git a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php index 0a67ea1846..1a1faed9e7 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php @@ -11,6 +11,7 @@ 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; @@ -32,14 +33,14 @@ class MemcachedAdapterTest extends AdapterTestCase public static function setUpBeforeClass(): void { if (!MemcachedAdapter::isSupported()) { - self::markTestSkipped('Extension memcached >=2.2.0 required.'); + throw new SkippedTestSuiteError('Extension memcached >=2.2.0 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) { - self::markTestSkipped('Memcached error: '.strtolower(self::$client->getResultMessage())); + throw new SkippedTestSuiteError('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 3540155685..95c0fd6f8a 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Cache\Tests\Adapter; +use PHPUnit\Framework\SkippedTestSuiteError; use Psr\Cache\CacheItemPoolInterface; use Symfony\Component\Cache\Adapter\PdoAdapter; @@ -26,7 +27,7 @@ class PdoAdapterTest extends AdapterTestCase public static function setUpBeforeClass(): void { if (!\extension_loaded('pdo_sqlite')) { - self::markTestSkipped('Extension pdo_sqlite required.'); + throw new SkippedTestSuiteError('Extension pdo_sqlite required.'); } self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache'); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php index 5c5f60a51b..c31f96dda5 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Cache\Tests\Adapter; use Doctrine\DBAL\DriverManager; +use PHPUnit\Framework\SkippedTestSuiteError; use Psr\Cache\CacheItemPoolInterface; use Symfony\Component\Cache\Adapter\PdoAdapter; @@ -27,7 +28,7 @@ class PdoDbalAdapterTest extends AdapterTestCase public static function setUpBeforeClass(): void { if (!\extension_loaded('pdo_sqlite')) { - self::markTestSkipped('Extension pdo_sqlite required.'); + throw new SkippedTestSuiteError('Extension pdo_sqlite required.'); } self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache'); diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php index 9db83c0db4..4367ce0bfa 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Cache\Tests\Adapter; +use PHPUnit\Framework\SkippedTestSuiteError; use Symfony\Component\Cache\Adapter\RedisAdapter; /** @@ -21,7 +22,7 @@ class PredisRedisClusterAdapterTest extends AbstractRedisAdapterTest public static function setUpBeforeClass(): void { 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.'); } 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 20f0811863..c8b3ce9b9d 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php @@ -11,6 +11,7 @@ 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; @@ -23,13 +24,13 @@ class RedisAdapterSentinelTest extends AbstractRedisAdapterTest public static function setUpBeforeClass(): void { if (!class_exists(\Predis\Client::class)) { - self::markTestSkipped('The Predis\Client class is required.'); + throw new SkippedTestSuiteError('The Predis\Client class is required.'); } if (!$hosts = getenv('REDIS_SENTINEL_HOSTS')) { - self::markTestSkipped('REDIS_SENTINEL_HOSTS env var is not defined.'); + throw new SkippedTestSuiteError('REDIS_SENTINEL_HOSTS env var is not defined.'); } if (!$service = getenv('REDIS_SENTINEL_SERVICE')) { - self::markTestSkipped('REDIS_SENTINEL_SERVICE env var is not defined.'); + throw new SkippedTestSuiteError('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 6e0b448746..f9d481dba7 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/RedisArrayAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisArrayAdapterTest.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Cache\Tests\Adapter; +use PHPUnit\Framework\SkippedTestSuiteError; + /** * @group integration */ @@ -20,7 +22,7 @@ class RedisArrayAdapterTest extends AbstractRedisAdapterTest { parent::setupBeforeClass(); if (!class_exists(\RedisArray::class)) { - self::markTestSkipped('The RedisArray class is required.'); + throw new SkippedTestSuiteError('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 011a36b338..fca50690ae 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/RedisClusterAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisClusterAdapterTest.php @@ -11,6 +11,7 @@ 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; @@ -25,10 +26,10 @@ class RedisClusterAdapterTest extends AbstractRedisAdapterTest 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.'); } self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['lazy' => true, 'redis_cluster' => true]); diff --git a/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php index 21b56e98c8..40830fc7fb 100644 --- a/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php +++ b/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Cache\Tests\Simple; +use PHPUnit\Framework\SkippedTestSuiteError; use Psr\SimpleCache\CacheInterface; use Symfony\Component\Cache\Simple\RedisCache; @@ -35,12 +36,12 @@ abstract class AbstractRedisCacheTest extends CacheTestCase public static function setUpBeforeClass(): void { if (!\extension_loaded('redis')) { - self::markTestSkipped('Extension redis required.'); + throw new SkippedTestSuiteError('Extension redis required.'); } try { (new \Redis())->connect(getenv('REDIS_HOST')); } catch (\Exception $e) { - self::markTestSkipped($e->getMessage()); + throw new SkippedTestSuiteError($e->getMessage()); } } diff --git a/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php index a76eeaafa1..1f47faa16c 100644 --- a/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php +++ b/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Cache\Tests\Simple; +use PHPUnit\Framework\SkippedTestSuiteError; use Psr\SimpleCache\CacheInterface; use Symfony\Component\Cache\Adapter\AbstractAdapter; use Symfony\Component\Cache\Exception\CacheException; @@ -33,14 +34,14 @@ class MemcachedCacheTest extends CacheTestCase public static function setUpBeforeClass(): void { if (!MemcachedCache::isSupported()) { - self::markTestSkipped('Extension memcached >=2.2.0 required.'); + throw new SkippedTestSuiteError('Extension memcached >=2.2.0 required.'); } self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST')); self::$client->get('foo'); $code = self::$client->getResultCode(); if (\Memcached::RES_SUCCESS !== $code && \Memcached::RES_NOTFOUND !== $code) { - self::markTestSkipped('Memcached error: '.strtolower(self::$client->getResultMessage())); + throw new SkippedTestSuiteError('Memcached error: '.strtolower(self::$client->getResultMessage())); } } diff --git a/src/Symfony/Component/Cache/Tests/Simple/PdoCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/PdoCacheTest.php index cf0ba1e52c..a32a6f4a7b 100644 --- a/src/Symfony/Component/Cache/Tests/Simple/PdoCacheTest.php +++ b/src/Symfony/Component/Cache/Tests/Simple/PdoCacheTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Cache\Tests\Simple; +use PHPUnit\Framework\SkippedTestSuiteError; use Psr\SimpleCache\CacheInterface; use Symfony\Component\Cache\Simple\PdoCache; use Symfony\Component\Cache\Tests\Adapter\PdoPruneableTrait; @@ -28,7 +29,7 @@ class PdoCacheTest extends CacheTestCase public static function setUpBeforeClass(): void { if (!\extension_loaded('pdo_sqlite')) { - self::markTestSkipped('Extension pdo_sqlite required.'); + throw new SkippedTestSuiteError('Extension pdo_sqlite required.'); } self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache'); diff --git a/src/Symfony/Component/Cache/Tests/Simple/PdoDbalCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/PdoDbalCacheTest.php index e35ab56734..a74c702a19 100644 --- a/src/Symfony/Component/Cache/Tests/Simple/PdoDbalCacheTest.php +++ b/src/Symfony/Component/Cache/Tests/Simple/PdoDbalCacheTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Cache\Tests\Simple; use Doctrine\DBAL\DriverManager; +use PHPUnit\Framework\SkippedTestSuiteError; use Psr\SimpleCache\CacheInterface; use Symfony\Component\Cache\Simple\PdoCache; use Symfony\Component\Cache\Tests\Adapter\PdoPruneableTrait; @@ -29,7 +30,7 @@ class PdoDbalCacheTest extends CacheTestCase public static function setUpBeforeClass(): void { if (!\extension_loaded('pdo_sqlite')) { - self::markTestSkipped('Extension pdo_sqlite required.'); + throw new SkippedTestSuiteError('Extension pdo_sqlite required.'); } self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache'); diff --git a/src/Symfony/Component/Cache/Tests/Simple/RedisArrayCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/RedisArrayCacheTest.php index 8173bcf101..6cd0d25b50 100644 --- a/src/Symfony/Component/Cache/Tests/Simple/RedisArrayCacheTest.php +++ b/src/Symfony/Component/Cache/Tests/Simple/RedisArrayCacheTest.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Cache\Tests\Simple; +use PHPUnit\Framework\SkippedTestSuiteError; + /** * @group legacy * @group integration @@ -21,7 +23,7 @@ class RedisArrayCacheTest extends AbstractRedisCacheTest { parent::setupBeforeClass(); if (!class_exists(\RedisArray::class)) { - self::markTestSkipped('The RedisArray class is required.'); + throw new SkippedTestSuiteError('The RedisArray class is required.'); } self::$redis = new \RedisArray([getenv('REDIS_HOST')], ['lazy_connect' => true]); } diff --git a/src/Symfony/Component/Cache/Tests/Simple/RedisClusterCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/RedisClusterCacheTest.php index bf20819df5..647d6e625e 100644 --- a/src/Symfony/Component/Cache/Tests/Simple/RedisClusterCacheTest.php +++ b/src/Symfony/Component/Cache/Tests/Simple/RedisClusterCacheTest.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Cache\Tests\Simple; +use PHPUnit\Framework\SkippedTestSuiteError; + /** * @group legacy * @group integration @@ -20,10 +22,10 @@ class RedisClusterCacheTest extends AbstractRedisCacheTest 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.'); } self::$redis = new \RedisCluster(null, explode(' ', $hosts)); diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php index 49acff5abc..471455d708 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php +++ b/src/Symfony/Component/HttpFoundation/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 @@ class ResponseFunctionalTest extends TestCase 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/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php index 45257abb98..f6417720d2 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php +++ b/src/Symfony/Component/HttpFoundation/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 @@ class AbstractSessionHandlerTest extends TestCase 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/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php index af5d9b2c73..55d3a028cc 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php +++ b/src/Symfony/Component/HttpFoundation/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.'); } } diff --git a/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php index fa93d0c570..a0b308d2ab 100644 --- a/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php @@ -11,6 +11,7 @@ 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; @@ -34,7 +35,7 @@ class MemcachedStoreTest extends AbstractStoreTest $code = $memcached->getResultCode(); if (\Memcached::RES_SUCCESS !== $code && \Memcached::RES_NOTFOUND !== $code) { - self::markTestSkipped('Unable to connect to the memcache host'); + throw new SkippedTestSuiteError('Unable to connect to the memcache host'); } } diff --git a/src/Symfony/Component/Lock/Tests/Store/PredisStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/PredisStoreTest.php index 9771d6e00d..179a8246f7 100644 --- a/src/Symfony/Component/Lock/Tests/Store/PredisStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/PredisStoreTest.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Lock\Tests\Store; +use PHPUnit\Framework\SkippedTestSuiteError; + /** * @author Jérémy Derussé * @group integration @@ -23,7 +25,7 @@ class PredisStoreTest extends AbstractRedisStoreTest try { $redis->connect(); } catch (\Exception $e) { - self::markTestSkipped($e->getMessage()); + throw new SkippedTestSuiteError($e->getMessage()); } } diff --git a/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php index d5074a3eb2..3b194d7c92 100644 --- a/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Lock\Tests\Store; +use PHPUnit\Framework\SkippedTestSuiteError; + /** * @author Jérémy Derussé * @@ -22,12 +24,12 @@ class RedisArrayStoreTest extends AbstractRedisStoreTest public static function setUpBeforeClass(): void { if (!class_exists(\RedisArray::class)) { - self::markTestSkipped('The RedisArray class is required.'); + throw new SkippedTestSuiteError('The RedisArray class is required.'); } try { (new \Redis())->connect(getenv('REDIS_HOST')); } catch (\Exception $e) { - self::markTestSkipped($e->getMessage()); + throw new SkippedTestSuiteError($e->getMessage()); } } diff --git a/src/Symfony/Component/Lock/Tests/Store/RedisClusterStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RedisClusterStoreTest.php index a6f2107fbd..9a565f58d9 100644 --- a/src/Symfony/Component/Lock/Tests/Store/RedisClusterStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/RedisClusterStoreTest.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Lock\Tests\Store; +use PHPUnit\Framework\SkippedTestSuiteError; + /** * @author Jérémy Derussé * @@ -22,10 +24,10 @@ class RedisClusterStoreTest extends AbstractRedisStoreTest 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 (!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.'); } } diff --git a/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php index acec9c4029..0f01e26407 100644 --- a/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Lock\Tests\Store; +use PHPUnit\Framework\SkippedTestSuiteError; use Symfony\Component\Lock\Exception\InvalidTtlException; use Symfony\Component\Lock\Store\RedisStore; @@ -27,7 +28,7 @@ class RedisStoreTest extends AbstractRedisStoreTest try { (new \Redis())->connect(getenv('REDIS_HOST')); } catch (\Exception $e) { - self::markTestSkipped($e->getMessage()); + throw new SkippedTestSuiteError($e->getMessage()); } } diff --git a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php index 26a79b58b7..50fd5cf737 100644 --- a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Messenger\Tests\Transport\RedisExt; +use PHPUnit\Framework\SkippedTestSuiteError; use PHPUnit\Framework\TestCase; use Symfony\Component\Messenger\Exception\TransportException; use Symfony\Component\Messenger\Transport\RedisExt\Connection; @@ -28,12 +29,12 @@ class ConnectionTest extends TestCase $redis->get(); } catch (TransportException $e) { if (0 === strpos($e->getMessage(), 'ERR unknown command \'X')) { - self::markTestSkipped('Redis server >= 5 is required'); + throw new SkippedTestSuiteError('Redis server >= 5 is required'); } throw $e; } catch (\RedisException $e) { - self::markTestSkipped($e->getMessage()); + throw new SkippedTestSuiteError($e->getMessage()); } } diff --git a/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php index a3249e940e..c297c41010 100644 --- a/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php +++ b/src/Symfony/Component/Security/Http/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; @@ -35,7 +36,7 @@ class PersistentTokenBasedRememberMeServicesTest extends TestCase try { random_bytes(1); } catch (\Exception $e) { - self::markTestSkipped($e->getMessage()); + throw new SkippedTestSuiteError($e->getMessage()); } }