8000 Merge branch '4.4' into 5.2 · symfony/cache@26214e9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 26214e9

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.2
* 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
2 parents 3b2a91a + 5b478f2 commit 26214e9

9 files changed

+24
-14
lines changed

‎Tests/Adapter/AbstractRedisAdapterTest.php

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

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

14+
use PHPUnit\Framework\SkippedTestSuiteError;
1415
use Psr\Cache\CacheItemPoolInterface;
1516
use Symfony\Component\Cache\Adapter\RedisAdapter;
1617

@@ -32,12 +33,12 @@ public function createCachePool(int $defaultLifetime = 0, string $testMethod = n
3233
public static function setUpBeforeClass(): void
3334
{
3435
if (!\extension_loaded('redis')) {
35-
self::markTestSkipped('Extension redis required.');
36+
throw new SkippedTestSuiteError('Extension redis required.');
3637
}
3738
try {
3839
(new \Redis())->connect(getenv('REDIS_HOST'));
3940
} catch (\Exception $e) {
40-
self::markTestSkipped($e->getMessage());
41+
throw new SkippedTestSuiteError($e->getMessage());
4142
}
4243
}
4344

‎Tests/Adapter/CouchbaseBucketAdapterTest.php

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

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

14+
use PHPUnit\Framework\SkippedTestSuiteError;
1415
use Psr\Cache\CacheItemPoolInterface;
1516
use Symfony\Component\Cache\Adapter\AbstractAdapter;
1617
use Symfony\Component\Cache\Adapter\CouchbaseBucketAdapter;
@@ -34,7 +35,7 @@ class CouchbaseBucketAdapterTest extends AdapterTestCase
3435
public static function setupBeforeClass(): void
3536
{
3637
if (!CouchbaseBucketAdapter::isSupported()) {
37-
self::markTestSkipped('Couchbase >= 2.6.0 < 3.0.0 is required.');
38+
throw new SkippedTestSuiteError('Couchbase >= 2.6.0 < 3.0.0 is required.');
3839
}
3940

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

‎Tests/Adapter/MemcachedAdapterTest.php

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

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

14+
use PHPUnit\Framework\SkippedTestSuiteError;
1415
use Psr\Cache\CacheItemPoolInterface;
1516
use Symfony\Component\Cache\Adapter\AbstractAdapter;
1617
use Symfony\Component\Cache\Adapter\MemcachedAdapter;
@@ -32,14 +33,14 @@ class MemcachedAdapterTest extends AdapterTestCase
3233
public static function setUpBeforeClass(): void
3334
{
3435
if (!MemcachedAdapter::isSupported()) {
35-
self::markTestSkipped('Extension memcached >=2.2.0 required.');
36+
throw new SkippedTestSuiteError('Extension memcached >=2.2.0 required.');
3637
}
3738
self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]);
3839
self::$client->get('foo');
3940
$code = self::$client->getResultCode();
4041

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

‎Tests/Adapter/PdoAdapterTest.php

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

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

14+
use PHPUnit\Framework\SkippedTestSuiteError;
1415
use Psr\Cache\CacheItemPoolInterface;
1516
use Symfony\Component\Cache\Adapter\PdoAdapter;
1617

@@ -26,7 +27,7 @@ class PdoAdapterTest extends AdapterTestCase
2627
public static function setUpBeforeClass(): void
2728
{
2829
if (!\extension_loaded('pdo_sqlite')) {
29-
self::markTestSkipped('Extension pdo_sqlite required.');
30+
throw new SkippedTestSuiteError('Extension pdo_sqlite required.');
3031
}
3132

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

‎Tests/Adapter/PdoDbalAdapterTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Doctrine\DBAL\Driver\AbstractMySQLDriver;
1616
use Doctrine\DBAL\DriverManager;
1717
use Doctrine\DBAL\Schema\Schema;
18+
use PHPUnit\Framework\SkippedTestSuiteError;
1819
use Psr\Cache\CacheItemPoolInterface;
1920
use Symfony\Component\Cache\Adapter\PdoAdapter;
2021

@@ -30,7 +31,7 @@ class PdoDbalAdapterTest extends AdapterTestCase
3031
public static function setUpBeforeClass(): void
3132
{
3233
if (!\extension_loaded('pdo_sqlite')) {
33-
self::markTestSkipped('Extension pdo_sqlite required.');
34+
throw new SkippedTestSuiteError('Extension pdo_sqlite required.');
3435
}
3536

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

‎Tests/Adapter/PredisRedisClusterAdapterTest.php

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

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

14+
use PHPUnit\Framework\SkippedTestSuiteError;
1415
use Symfony\Component\Cache\Adapter\RedisAdapter;
1516

1617
/**
@@ -21,7 +22,7 @@ class PredisRedisClusterAdapterTest extends AbstractRedisAdapterTest
2122
public static function setUpBeforeClass(): void
2223
{
2324
if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
24-
self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
25+
throw new SkippedTestSuiteError('REDIS_CLUSTER_HOSTS env var is not defined.');
2526
}
2627

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

‎Tests/Adapter/RedisAdapterSentinelTest.php

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

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

14+
use PHPUnit\Framework\SkippedTestSuiteError;
1415
use Symfony\Component\Cache\Adapter\AbstractAdapter;
1516
use Symfony\Component\Cache\Adapter\RedisAdapter;
1617
use Symfony\Component\Cache\Exception\InvalidArgumentException;
@@ -23,13 +24,13 @@ class RedisAdapterSentinelTest extends AbstractRedisAdapterTest
2324
public static function setUpBeforeClass(): void
2425
{
2526
if (!class_exists(\Predis\Client::class)) {
26-
self::markTestSkipped('The Predis\Client class is required.');
27+
throw new SkippedTestSuiteError('The Predis\Client class is required.');
2728
}
2829
if (!$hosts = getenv('REDIS_SENTINEL_HOSTS')) {
29-
self::markTestSkipped('REDIS_SENTINEL_HOSTS env var is not defined.');
30+
throw new SkippedTestSuiteError('REDIS_SENTINEL_HOSTS env var is not defined.');
3031
}
3132
if (!$service = getenv('REDIS_SENTINEL_SERVICE')) {
32-
self::markTestSkipped('REDIS_SENTINEL_SERVICE env var is not defined.');
33+
throw new SkippedTestSuiteError('REDIS_SENTINEL_SERVICE env var is not defined.');
3334
}
3435

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

‎Tests/Adapter/RedisArrayAdapterTest.php

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

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

14+
use PHPUnit\Framework\SkippedTestSuiteError;
15+
1416
/**
1517
* @group integration
1618
*/
@@ -20,7 +22,7 @@ public static function setUpBeforeClass(): void
2022
{
2123
parent::setupBeforeClass();
2224
if (!class_exists(\RedisArray::class)) {
23-
self::markTestSkipped('The RedisArray class is required.');
25+
throw new SkippedTestSuiteError('The RedisArray class is required.');
2426
}
2527
self::$redis = new \RedisArray([getenv('REDIS_HOST')], ['lazy_connect' => true]);
2628
self::$redis->setOption(\Redis::OPT_PREFIX, 'prefix_');

‎Tests/Adapter/RedisClusterAdapterTest.php

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

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

14+
use PHPUnit\Framework\SkippedTestSuiteError;
1415
use Psr\Cache\CacheItemPoolInterface;
1516
use Symfony\Component\Cache\Adapter\AbstractAdapter;
1617
use Symfony\Component\Cache\Adapter\RedisAdapter;
@@ -25,10 +26,10 @@ class RedisClusterAdapterTest extends AbstractRedisAdapterTest
2526
public static function setUpBeforeClass(): void
2627
{
2728
if (!class_exists(\RedisCluster::class)) {
28-
self::markTestSkipped('The RedisCluster class is required.');
29+
throw new SkippedTestSuiteError('The RedisCluster class is required.');
2930
}
3031
if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
31-
self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
32+
throw new SkippedTestSuiteError('REDIS_CLUSTER_HOSTS env var is not defined.');
3233
}
3334

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

0 commit comments

Comments
 (0)
0