From 34ccf3bd733215da3037f82a85bbbf4c18fac683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= <jeremy@derusse.com>
Date: Thu, 23 Jul 2020 14:42:41 +0200
Subject: [PATCH 1/2] Fix Redis tests

---
 Tests/Store/RedisArrayStoreTest.php | 7 ++++---
 Tests/Store/RedisStoreTest.php      | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Tests/Store/RedisArrayStoreTest.php b/Tests/Store/RedisArrayStoreTest.php
index 6f50dce..a15c02f 100644
--- a/Tests/Store/RedisArrayStoreTest.php
+++ b/Tests/Store/RedisArrayStoreTest.php
@@ -23,9 +23,10 @@ public static function setUpBeforeClass()
         if (!class_exists('RedisArray')) {
             self::markTestSkipped('The RedisArray class is required.');
         }
-        if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
-            $e = error_get_last();
-            self::markTestSkipped($e['message']);
+        try {
+            (new \Redis())->connect(getenv('REDIS_HOST'));
+        } catch (\Exception $e) {
+            self::markTestSkipped($e->getMessage());
         }
     }
 
diff --git a/Tests/Store/RedisStoreTest.php b/Tests/Store/RedisStoreTest.php
index fd35ab4..a7a3cbf 100644
--- a/Tests/Store/RedisStoreTest.php
+++ b/Tests/Store/RedisStoreTest.php
@@ -20,9 +20,10 @@ class RedisStoreTest extends AbstractRedisStoreTest
 {
     public static function setUpBeforeClass()
     {
-        if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
-            $e = error_get_last();
-            self::markTestSkipped($e['message']);
+        try {
+            (new \Redis())->connect(getenv('REDIS_HOST'));
+        } catch (\Exception $e) {
+            self::markTestSkipped($e->getMessage());
         }
     }
 

From 7e4a5352619fae7d545c2bb93486bf098a920572 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Mon, 17 Aug 2020 09:16:16 +0200
Subject: [PATCH 2/2] Fix CS

---
 Store/CombinedStore.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Store/CombinedStore.php b/Store/CombinedStore.php
index d1ffaba..bd0753b 100644
--- a/Store/CombinedStore.php
+++ b/Store/CombinedStore.php
@@ -28,8 +28,8 @@
  */
 class CombinedStore implements StoreInterface, LoggerAwareInterface
 {
-    use LoggerAwareTrait;
     use ExpiringStoreTrait;
+    use LoggerAwareTrait;
 
     /** @var StoreInterface[] */
     private $stores;