10000 Fix Redis tests · symfony/symfony@f524c85 · GitHub
[go: up one dir, main page]

Skip to content

Commit f524c85

Browse files
committed
Fix Redis tests
1 parent 8c9f181 commit f524c85

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ public static function setUpBeforeClass()
3333
if (!\extension_loaded('redis')) {
3434
self::markTestSkipped('Extension redis required.');
3535
}
36-
if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
37-
$e = error_get_last();
38-
self::markTestSkipped($e['message']);
36+
try {
37+
(new \Redis())->connect(getenv('REDIS_HOST'));
38+
} catch (\Exception $e) {
39+
self::markTestSkipped($e->getMessage());
3940
}
4041
}
4142

src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ public static function setUpBeforeClass()
3333
if (!\extension_loaded('redis')) {
3434
self::markTestSkipped('Extension redis required.');
3535
}
36-
if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
37-
$e = error_get_last();
38-
self::markTestSkipped($e['message']);
36+
try {
37+
(new \Redis())->connect(getenv('REDIS_HOST'));
38+
} catch (\Exception $e) {
39+
self::markTestSkipped($e->getMessage());
3940
}
4041
}
4142

src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ public static function setUpBeforeClass()
2323
if (!class_exists('RedisArray')) {
2424
self::markTestSkipped('The RedisArray class is required.');
2525
}
26-
if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
27-
$e = error_get_last();
28-
self::markTestSkipped($e['message']);
26+
try {
27+
(new \Redis())->connect(getenv('REDIS_HOST'));
28+
} catch (\Exception $e) {
29+
self::markTestSkipped($e->getMessage());
2930
}
3031
}
3132

src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ class RedisStoreTest extends AbstractRedisStoreTest
2020
{
2121
public static function setUpBeforeClass()
2222
{
23-
if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
24-
$e = error_get_last();
25-
self::markTestSkipped($e['message']);
23+
try {
24+
(new \Redis())->connect(getenv('REDIS_HOST'));
25+
} catch (\Exception $e) {
26+
self::markTestSkipped($e->getMessage());
2627
}
2728
}
2829

0 commit comments

Comments
 (0)
0