Skip to content

Commit 9e279cd

Browse files
Merge branch '4.4' into 5.0
* 4.4: (23 commits) [Filesystem] Handle paths on different drives [WebProfiler] Do not add src-elem CSP directives if they do not exist [Yaml] fix parse error when unindented collections contain a comment Execute docker dependent tests with github actions Update exception.html.php [3.4][Inflector] Improve testSingularize() argument name [Inflector] Fix testPluralize() arguments names [PhpUnitBridge] fix PHP 5.3 compat again Skip validation when email is an empty object fix sr_Latn translation [Validator] fix lazy property usage. Fix annotation [Debug][ErrorHandler] cleanup phpunit.xml.dist files [Translation] Fix for translation:update command updating ICU messages [PhpUnitBridge] fix compat with PHP 5.3 bumped Symfony version to 4.4.9 updated VERSION for 4.4.8 updated CHANGELOG for 4.4.8 provide a useful message when extension types don't match [Cache] Fixed not supported Redis eviction policies ...
2 parents a95c907 + a270c64 commit 9e279cd

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

Tests/Store/MemcachedStoreTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
* @author Jérémy Derussé <[email protected]>
2020
*
2121
* @requires extension memcached
22+
* @group integration
2223
*/
2324
class MemcachedStoreTest extends AbstractStoreTest
2425
{

Tests/Store/PredisStoreTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
/**
1515
* @author Jérémy Derussé <[email protected]>
16+
* @group integration
1617
*/
1718
class PredisStoreTest extends AbstractRedisStoreTest
1819
{

Tests/Store/RedisArrayStoreTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* @author Jérémy Derussé <[email protected]>
1616
*
1717
* @requires extension redis
18+
* @group integration
1819
*/
1920
class RedisArrayStoreTest extends AbstractRedisStoreTest
2021
{
@@ -23,9 +24,10 @@ public static function setUpBeforeClass(): void
2324
if (!class_exists('RedisArray')) {
2425
self::markTestSkipped('The RedisArray class is required.');
2526
}
26-
if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
27-
$e = error_get_last();
28-
self::markTestSkipped($e['message']);
27+
try {
28+
(new \Redis())->connect(getenv('REDIS_HOST'));
29+
} catch (\Exception $e) {
30+
self::markTestSkipped($e->getMessage());
2931
}
3032
}
3133

Tests/Store/RedisClusterStoreTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* @author Jérémy Derussé <[email protected]>
1616
*
1717
* @requires extension redis
18+
* @group integration
1819
*/
1920
class RedisClusterStoreTest extends AbstractRedisStoreTest
2021
{

Tests/Store/RedisStoreTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,16 @@
1717
* @author Jérémy Derussé <[email protected]>
1818
*
1919
* @requires extension redis
20+
* @group integration
2021
*/
2122
class RedisStoreTest extends AbstractRedisStoreTest
2223
{
2324
public static function setUpBeforeClass(): void
2425
{
25-
if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
26-
$e = error_get_last();
27-
self::markTestSkipped($e['message']);
26+
try {
27+
(new \Redis())->connect(getenv('REDIS_HOST'));
28+
} catch (\Exception $e) {
29+
self::markTestSkipped($e->getMessage());
2830
}
2931
}
3032

0 commit comments

Comments
 (0)