Skip to content

Commit 41eb669

Browse files
digilistnicolas-grekas
digilist
authored and
nicolas-grekas
committed
Replace usages of SkippedTestSuiteError with markTestSkipped() call
1 parent 1b0aed0 commit 41eb669

29 files changed

+50
-88
lines changed

‎src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTestCase.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Cache\Tests\Adapter;
1313

14-
use PHPUnit\Framework\SkippedTestSuiteError;
1514
use Psr\Cache\CacheItemPoolInterface;
1615
use Relay\Relay;
1716
use Symfony\Component\Cache\Adapter\RedisAdapter;
@@ -34,12 +33,12 @@ public function createCachePool(int $defaultLifetime = 0, string $testMethod = n
3433
public static function setUpBeforeClass(): void
3534
{
3635
if (!\extension_loaded('redis')) {
37-
throw new SkippedTestSuiteError('Extension redis required.');
36+
self::markTestSkipped('Extension redis required.');
3837
}
3938
try {
4039
(new \Redis())->connect(...explode(':', getenv('REDIS_HOST')));
4140
} catch (\Exception $e) {
42-
throw new SkippedTestSuiteError(getenv('REDIS_HOST').': '.$e->getMessage());
41+
self::markTestSkipped(getenv('REDIS_HOST').': '.$e->getMessage());
4342
}
4443
}
4544

‎src/Symfony/Component/Cache/Tests/Adapter/CouchbaseBucketAdapterTest.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Cache\Tests\Adapter;
1313

14-
use PHPUnit\Framework\SkippedTestSuiteError;
1514
use Psr\Cache\CacheItemPoolInterface;
1615
use Symfony\Component\Cache\Adapter\AbstractAdapter;
1716
use Symfony\Component\Cache\Adapter\CouchbaseBucketAdapter;
@@ -35,7 +34,7 @@ class CouchbaseBucketAdapterTest extends AdapterTestCase
3534
public static function setupBeforeClass(): void
3635
{
3736
if (!CouchbaseBucketAdapter::isSupported()) {
38-
throw new SkippedTestSuiteError('Couchbase >= 2.6.0 < 3.0.0 is required.');
37+
self::markTestSkipped('Couchbase >= 2.6.0 < 3.0.0 is required.');
3938
}
4039

4140
self::$client = AbstractAdapter::createConnection('couchbase://'.getenv('COUCHBASE_HOST').'/cache',

‎src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
use Doctrine\DBAL\DriverManager;
1919
use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
2020
use Doctrine\DBAL\Schema\Schema;
21-
use PHPUnit\Framework\SkippedTestSuiteError;
2221
use Psr\Cache\CacheItemPoolInterface;
2322
use Symfony\Component\Cache\Adapter\DoctrineDbalAdapter;
2423
use Symfony\Component\Cache\Tests\Fixtures\DriverWrapper;
@@ -33,7 +32,7 @@ class DoctrineDbalAdapterTest extends AdapterTestCase
3332
public static function setUpBeforeClass(): void
3433
{
3534
if (!\extension_loaded('pdo_sqlite')) {
36-
throw new SkippedTestSuiteError('Extension pdo_sqlite required.');
35+
self::markTestSkipped('Extension pdo_sqlite required.');
3736
}
3837

3938
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');

‎src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Cache\Tests\Adapter;
1313

14-
use PHPUnit\Framework\SkippedTestSuiteError;
1514
use Psr\Cache\CacheItemPoolInterface;
1615
use Symfony\Component\Cache\Adapter\AbstractAdapter;
1716
use Symfony\Component\Cache\Adapter\MemcachedAdapter;
@@ -33,14 +32,14 @@ class MemcachedAdapterTest extends AdapterTestCase
3332
public static function setUpBeforeClass(): void
3433
{
3534
if (!MemcachedAdapter::isSupported()) {
36-
throw new SkippedTestSuiteError('Extension memcached > 3.1.5 required.');
35+
self::markTestSkipped('Extension memcached > 3.1.5 required.');
3736
}
3837
self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]);
3938
self::$client->get('foo');
4039
$code = self::$client->getResultCode();
4140

4241
if (\Memcached::RES_SUCCESS !== $code && \Memcached::RES_NOTFOUND !== $code) {
43-
throw new SkippedTestSuiteError('Memcached error: '.strtolower(self::$client->getResultMessage()));
42+
self::markTestSkipped('Memcached error: '.strtolower(self::$client->getResultMessage()));
4443
}
4544
}
4645

‎src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Cache\Tests\Adapter;
1313

14-
use PHPUnit\Framework\SkippedTestSuiteError;
1514
use Psr\Cache\CacheItemPoolInterface;
1615
use Symfony\Component\Cache\Adapter\PdoAdapter;
1716

@@ -25,7 +24,7 @@ class PdoAdapterTest extends AdapterTestCase
2524
public static function setUpBeforeClass(): void
2625
{
2726
if (!\extension_loaded('pdo_sqlite')) {
28-
throw new SkippedTestSuiteError('Extension pdo_sqlite required.');
27+
self::markTestSkipped('Extension pdo_sqlite required.');
2928
}
3029

3130
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');

‎src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterSentinelTest.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Cache\Tests\Adapter;
1313

14-
use PHPUnit\Framework\SkippedTestSuiteError;
1514
use Symfony\Component\Cache\Adapter\AbstractAdapter;
1615

1716
/**
@@ -22,13 +21,13 @@ class PredisAdapterSentinelTest extends AbstractRedisAdapterTestCase
2221
public static function setUpBeforeClass(): void
2322
{
2423
if (!class_exists(\Predis\Client::class)) {
25-
throw new SkippedTestSuiteError('The Predis\Client class is required.');
24+
self::markTestSkipped('The Predis\Client class is required.');
2625
}
2726
if (!$hosts = getenv('REDIS_SENTINEL_HOSTS')) {
28-
throw new SkippedTestSuiteError('REDIS_SENTINEL_HOSTS env var is not defined.');
27+
self::markTestSkipped('REDIS_SENTINEL_HOSTS env var is not defined.');
2928
}
3029
if (!$service = getenv('REDIS_SENTINEL_SERVICE')) {
31-
throw new SkippedTestSuiteError('REDIS_SENTINEL_SERVICE env var is not defined.');
30+
self::markTestSkipped('REDIS_SENTINEL_SERVICE env var is not defined.');
3231
}
3332

3433
self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['redis_sentinel' => $service, 'class' => \Predis\Client::class]);

‎src/Symfony/Component/Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Cache\Tests\Adapter;
1313

14-
use PHPUnit\Framework\SkippedTestSuiteError;
1514
use Symfony\Component\Cache\Adapter\RedisAdapter;
1615

1716
/**
@@ -22,7 +21,7 @@ class PredisRedisClusterAdapterTest extends AbstractRedisAdapterTestCase
2221
public static function setUpBeforeClass(): void
2322
{
2423
if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
25-
throw new SkippedTestSuiteError('REDIS_CLUSTER_HOSTS env var is not defined.');
24+
self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
2625
}
2726

2827
self::$redis = RedisAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['class' => \Predis\Client::class, 'redis_cluster' => true, 'prefix' => 'prefix_']);

‎src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Cache\Tests\Adapter;
1313

14-
use PHPUnit\Framework\SkippedTestSuiteError;
1514
use Symfony\Component\Cache\Adapter\AbstractAdapter;
1615
use Symfony\Component\Cache\Adapter\RedisAdapter;
1716
use Symfony\Component\Cache\Exception\InvalidArgumentException;
@@ -24,13 +23,13 @@ class RedisAdapterSentinelTest extends AbstractRedisAdapterTestCase
2423
public static function setUpBeforeClass(): void
2524
{
2625
if (!class_exists(\RedisSentinel::class)) {
27-
throw new SkippedTestSuiteError('The RedisSentinel class is required.');
26+
self::markTestSkipped('The RedisSentinel class is required.');
2827
}
2928
if (!$hosts = getenv('REDIS_SENTINEL_HOSTS')) {
30-
throw new SkippedTestSuiteError('REDIS_SENTINEL_HOSTS env var is not defined.');
29+
self::markTestSkipped('REDIS_SENTINEL_HOSTS env var is not defined.');
3130
}
3231
if (!$service = getenv('REDIS_SENTINEL_SERVICE')) {
33-
throw new SkippedTestSuiteError('REDIS_SENTINEL_SERVICE env var is not defined.');
32+
self::markTestSkipped('REDIS_SENTINEL_SERVICE env var is not defined.');
3433
}
3534

3635
self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['redis_sentinel' => $service, 'prefix' => 'prefix_']);

‎src/Symfony/Component/Cache/Tests/Adapter/RedisArrayAdapterTest.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
namespace Symfony\Component\Cache\Tests\Adapter;
1313

14-
use PHPUnit\Framework\SkippedTestSuiteError;
15-
1614
/**
1715
* @group integration
1816
*/
@@ -22,7 +20,7 @@ public static function setUpBeforeClass(): void
2220
{
2321
parent::setupBeforeClass();
2422
if (!class_exists(\RedisArray::class)) {
25-
throw new SkippedTestSuiteError('The RedisArray class is required.');
23+
self::markTestSkipped('The RedisArray class is required.');
2624
}
2725
self::$redis = new \RedisArray([getenv('REDIS_HOST')], ['lazy_connect' => true]);
2826
self::$redis->setOption(\Redis::OPT_PREFIX, 'prefix_');

‎src/Symfony/Component/Cache/Tests/Adapter/RedisClusterAdapterTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Cache\Tests\Adapter;
1313

14-
use PHPUnit\Framework\SkippedTestSuiteError;
1514
use Psr\Cache\CacheItemPoolInterface;
1615
use Symfony\Component\Cache\Adapter\AbstractAdapter;
1716
use Symfony\Component\Cache\Adapter\RedisAdapter;
@@ -26,10 +25,10 @@ class RedisClusterAdapterTest extends AbstractRedisAdapterTestCase
2625
public static function setUpBeforeClass(): void
2726
{
2827
if (!class_exists(\RedisCluster::class)) {
29-
throw new SkippedTestSuiteError('The RedisCluster class is required.');
28+
self::markTestSkipped('The RedisCluster class is required.');
3029
}
3130
if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
32-
throw new SkippedTestSuiteError('REDIS_CLUSTER_HOSTS env var is not defined.');
31+
self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
3332
}
3433

3534
self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['lazy' => true, 'redis_cluster' => true]);

0 commit comments

Comments
 (0)