install pecl redis on travis

Author: jeffreyzant

.travis.yml

@@ -128,6 +128,9 @@ before_install:
 
 install: travis_retry composer install --prefer-dist --no-interaction --no-suggest
 
-before_script: SUPERVISE=no travis_retry ./start-cluster.sh || { cat ./cluster/*.log; false; }
+before_script:
+  - sudo pecl install redis
+  - echo "extension=redis.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+  - SUPERVISE=no travis_retry ./start-cluster.sh || { cat ./cluster/*.log; false; }
 
 script: vendor/bin/phpunit --exclude-group ${LUMEN_VERSION:+laravel-only},${HORIZON:-horizon}

src/Connections/PhpRedisConnection.php

@@ -2,7 +2,7 @@
 
 namespace Monospice\LaravelRedisSentinel\Connections;
 
-use Monospice\LaravelRedisSentinel\Exceptions\RetryRedisException;
+use Monospice\LaravelRedisSentinel\Exceptions\RedisRetryException;
 use Closure;
 use Illuminate\Redis\Connections\PhpRedisConnection as LaravelPhpRedisConnection;
 use Redis;
@@ -188,7 +188,7 @@ public function command($method, array $parameters = [])
      * @param callable $callback The operation to execute.
      * @return mixed The result of the first successful attempt.
      *
-     * @throws RedisException After exhausting the allowed number of
+     * @throws RedisRetryException After exhausting the allowed number of
      * attempts to reconnect.
      */
     protected function retryOnFailure(callable $callback)
@@ -214,6 +214,6 @@ protected function retryOnFailure(callable $callback)
             }
         } while ($attempts < $this->retryLimit);
 
-        throw new RetryRedisException(sprintf('Reached the reconnect limit of %d attempts', $attempts));
+        throw new RedisRetryException(sprintf('Reached the reconnect limit of %d attempts', $attempts));
     }
 }

src/Connectors/PhpRedisConnector.php

@@ -154,10 +154,12 @@ private function updateSentinels(RedisSentinel $sentinel, string $currentHost, i
                     'host' => $currentHost,
                     'port' => $currentPort,
                 ]
-            ], array_map(fn ($sentinel) => [
-                'host' => $sentinel['ip'],
-                'port' => $sentinel['port'],
-            ], $sentinel->sentinels($service))
+            ], array_map(function ($sentinel) {
+                return [
+                    'host' => $sentinel['ip'],
+                    'port' => $sentinel['port'],
+                ];
+            }, $sentinel->sentinels($service))
         );
     }
 

src/Exceptions/RetryRedisException.php src/Exceptions/RedisRetryException.phpsrc/Exceptions/RetryRedisException.php renamed to src/Exceptions/RedisRetryException.php

@@ -4,7 +4,7 @@
 
 use RedisException as PhpRedisException;
 
-class RetryRedisException extends PhpRedisException
+class RedisRetryException extends PhpRedisException
 {
     //
 }

tests/Integration/Connections/PhpRedisConnectionTest.php

@@ -7,7 +7,7 @@
 use Monospice\LaravelRedisSentinel\Connectors\PhpRedisConnector;
 use Monospice\LaravelRedisSentinel\Tests\Support\DummyException;
 use Monospice\LaravelRedisSentinel\Tests\Support\IntegrationTestCase;
-use Monospice\LaravelRedisSentinel\Exceptions\RetryRedisException;
+use Monospice\LaravelRedisSentinel\Exceptions\RedisRetryException;
 use Redis;
 use RedisException;
 
@@ -95,11 +95,9 @@ public function testAbortsTransactionOnException()
 
     public function testRetriesTransactionWhenConnectionFails()
     {
-        $this->expectException(RetryRedisException::class);
+        $this->expectException(RedisRetryException::class);
 
-        $expectedRetries = 2;
-
-        $this->subject = $this->makeConnection($expectedRetries, 0); // retry immediately
+        $this->subject = $this->makeConnection(1, 0); // retry once and immediately
 
         $this->subject->transaction(function () {
             throw new RedisException();