[Cache] Fix connecting to Redis via a socket file

alebedev80 · nicolas-grekas · commit dd73e8f61cc3 · 2022-02-04T19:26:35.000+01:00
diff --git a/Tests/Store/CombinedStoreTest.php b/Tests/Store/CombinedStoreTest.php
@@ -41,7 +41,7 @@ protected function getClockDelay()
      */
     public function getStore(): PersistingStoreInterface
     {
-        $redis = new \Predis\Client('tcp://'.getenv('REDIS_HOST').':6379');
+        $redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => null]));
         try {
             $redis->connect();
         } catch (\Exception $e) {
diff --git a/Tests/Store/PredisStoreTest.php b/Tests/Store/PredisStoreTest.php
@@ -21,7 +21,7 @@ class PredisStoreTest extends AbstractRedisStoreTest
 {
     public static function setUpBeforeClass(): void
     {
-        $redis = new \Predis\Client('tcp://'.getenv('REDIS_HOST').':6379');
+        $redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => null]));
         try {
             $redis->connect();
         } catch (\Exception $e) {
@@ -31,7 +31,7 @@ public static function setUpBeforeClass(): void
 
     protected function getRedisConnection()
     {
-        $redis = new \Predis\Client('tcp://'.getenv('REDIS_HOST').':6379');
+        $redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => null]));
         $redis->connect();
 
         return $redis;
diff --git a/Tests/Store/RedisArrayStoreTest.php b/Tests/Store/RedisArrayStoreTest.php
@@ -27,7 +27,7 @@ public static function setUpBeforeClass(): void
             throw new SkippedTestSuiteError('The RedisArray class is required.');
         }
         try {
-            (new \Redis())->connect(getenv('REDIS_HOST'));
+            (new \Redis())->connect(...explode(':', getenv('REDIS_HOST')));
         } catch (\Exception $e) {
             throw new SkippedTestSuiteError($e->getMessage());
         }
diff --git a/Tests/Store/RedisStoreTest.php b/Tests/Store/RedisStoreTest.php
@@ -26,7 +26,7 @@ class RedisStoreTest extends AbstractRedisStoreTest
     public static function setUpBeforeClass(): void
     {
         try {
-            (new \Redis())->connect(getenv('REDIS_HOST'));
+            (new \Redis())->connect(...explode(':', getenv('REDIS_HOST')));
         } catch (\Exception $e) {
             throw new SkippedTestSuiteError($e->getMessage());
         }
@@ -35,7 +35,7 @@ public static function setUpBeforeClass(): void
     protected function getRedisConnection()
     {
         $redis = new \Redis();
-        $redis->connect(getenv('REDIS_HOST'));
+        $redis->connect(...explode(':', getenv('REDIS_HOST')));
 
         return $redis;
     }
diff --git a/Tests/Store/RetryTillSaveStoreTest.php b/Tests/Store/RetryTillSaveStoreTest.php
@@ -24,7 +24,7 @@ class RetryTillSaveStoreTest extends AbstractStoreTest
 
     public function getStore(): PersistingStoreInterface
     {
-        $redis = new \Predis\Client('tcp://'.getenv('REDIS_HOST').':6379');
+        $redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => null]));
         try {
             $redis->connect();
         } catch (\Exception $e) {

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ protected function getClockDelay()`
`41`	`41`	`*/`
`42`	`42`	`public function getStore(): PersistingStoreInterface`
`43`	`43`	`{`
`44`		`- $redis = new \Predis\Client('tcp://'.getenv('REDIS_HOST').':6379');`
	`44`	`+ $redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => null]));`
`45`	`45`	`try {`
`46`	`46`	`$redis->connect();`
`47`	`47`	`} catch (\Exception $e) {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class PredisStoreTest extends AbstractRedisStoreTest`
`21`	`21`	`{`
`22`	`22`	`public static function setUpBeforeClass(): void`
`23`	`23`	`{`
`24`		`- $redis = new \Predis\Client('tcp://'.getenv('REDIS_HOST').':6379');`
	`24`	`+ $redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => null]));`
`25`	`25`	`try {`
`26`	`26`	`$redis->connect();`
`27`	`27`	`} catch (\Exception $e) {`
`@@ -31,7 +31,7 @@ public static function setUpBeforeClass(): void`
`31`	`31`
`32`	`32`	`protected function getRedisConnection()`
`33`	`33`	`{`
`34`		`- $redis = new \Predis\Client('tcp://'.getenv('REDIS_HOST').':6379');`
	`34`	`+ $redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => null]));`
`35`	`35`	`$redis->connect();`
`36`	`36`
`37`	`37`	`return $redis;`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public static function setUpBeforeClass(): void`
`27`	`27`	`throw new SkippedTestSuiteError('The RedisArray class is required.');`
`28`	`28`	`}`
`29`	`29`	`try {`
`30`		`- (new \Redis())->connect(getenv('REDIS_HOST'));`
	`30`	`+ (new \Redis())->connect(...explode(':', getenv('REDIS_HOST')));`
`31`	`31`	`} catch (\Exception $e) {`
`32`	`32`	`throw new SkippedTestSuiteError($e->getMessage());`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class RedisStoreTest extends AbstractRedisStoreTest`
`26`	`26`	`public static function setUpBeforeClass(): void`
`27`	`27`	`{`
`28`	`28`	`try {`
`29`		`- (new \Redis())->connect(getenv('REDIS_HOST'));`
	`29`	`+ (new \Redis())->connect(...explode(':', getenv('REDIS_HOST')));`
`30`	`30`	`} catch (\Exception $e) {`
`31`	`31`	`throw new SkippedTestSuiteError($e->getMessage());`
`32`	`32`	`}`
`@@ -35,7 +35,7 @@ public static function setUpBeforeClass(): void`
`35`	`35`	`protected function getRedisConnection()`
`36`	`36`	`{`
`37`	`37`	`$redis = new \Redis();`
`38`		`- $redis->connect(getenv('REDIS_HOST'));`
	`38`	`+ $redis->connect(...explode(':', getenv('REDIS_HOST')));`
`39`	`39`
`40`	`40`	`return $redis;`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class RetryTillSaveStoreTest extends AbstractStoreTest`
`24`	`24`
`25`	`25`	`public function getStore(): PersistingStoreInterface`
`26`	`26`	`{`
`27`		`- $redis = new \Predis\Client('tcp://'.getenv('REDIS_HOST').':6379');`
	`27`	`+ $redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => null]));`
`28`	`28`	`try {`
`29`	`29`	`$redis->connect();`
`30`	`30`	`} catch (\Exception $e) {`