bug #24758 Throwing exception if redis and predis unavailable (aequasi)

fabpot · fabpot · commit ca10f8ee2c5a · 2017-10-30T11:07:17.000-07:00
This PR was squashed before being merged into the 3.3 branch (closes #24758). Discussion ---------- Throwing exception if redis and predis unavailable If the redis extension and predis are unavailable, line 137 throws an exception stating that \Predis\Client is not a class. | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | none | License | MIT | Doc PR | none If the redis extension and predis are unavailable, the new line 137 throws an exception stating that \Predis\Client is not a class. Commits ------- e664c81 Throwing exception if redis and predis unavailable
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -16,6 +16,7 @@
 use Predis\Connection\Aggregate\PredisCluster;
 use Predis\Connection\Aggregate\RedisCluster;
 use Predis\Response\Status;
+use Symfony\Component\Cache\Exception\CacheException;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 
 /**
@@ -108,6 +109,9 @@ public static function createConnection($dsn, array $options = array())
             $params += $query;
         }
         $params += $options + self::$defaultConnectionOptions;
+        if (null === $params['class'] && !extension_loaded('redis') && !class_exists(\Predis\Client::class)) {
+            throw new CacheException(sprintf('Cannot find the "redis" extension, and "predis/predis" is not installed: %s', $dsn));
+        }
         $class = null === $params['class'] ? (extension_loaded('redis') ? \Redis::class : \Predis\Client::class) : $params['class'];
 
         if (is_a($class, \Redis::class, true)) {
