Merge pull request #11 from Nyholm/predis

Renamed to Predis

Author: cryptiklemur

src/Factory/PhpRedisFactory.php src/Factory/PredisFactory.phpsrc/Factory/PhpRedisFactory.php renamed to src/Factory/PredisFactory.php

@@ -11,27 +11,27 @@
 
 namespace Cache\AdapterBundle\Factory;
 
-use Cache\Adapter\PhpRedis\PhpRedisCachePool;
+use Cache\Adapter\Predis\PredisCachePool;
+use Predis\Client;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class PhpRedisFactory extends AbstractAdapterFactory
+class PredisFactory extends AbstractAdapterFactory
 {
     protected static $dependencies = [
-        ['requiredClass' => 'Cache\Adapter\PhpRedis\PhpRedisCachePool', 'packageName' => 'cache/phpredis-adapter'],
+        ['requiredClass' => 'Cache\Adapter\Predis\PredisCachePool', 'packageName' => 'cache/predis-adapter'],
     ];
 
     /**
      * {@inheritdoc}
      */
     public function getAdapter(array $config)
     {
-        $client = new \Redis();
-        $client->client($config['host'], $config['port']);
+        $client = new Client(sprintf('%s://%s:%s', $config['protocol'], $config['host'], $config['port']));
 
-        return new PhpRedisCachePool($client);
+        return new PredisCachePool($client);
     }
 
     /**
@@ -42,9 +42,11 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
         $resolver->setDefaults([
             'host'     => '127.0.0.1',
             'port'     => '6379',
+            'protocol' => 'tcp',
         ]);
 
         $resolver->setAllowedTypes('host', ['string']);
         $resolver->setAllowedTypes('port', ['string', 'int']);
+        $resolver->setAllowedTypes('protocol', ['string']);
     }
 }

src/Factory/RedisFactory.php

@@ -12,7 +12,6 @@
 namespace Cache\AdapterBundle\Factory;
 
 use Cache\Adapter\Redis\RedisCachePool;
-use Predis\Client;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -29,7 +28,8 @@ class RedisFactory extends AbstractAdapterFactory
      */
     public function getAdapter(array $config)
     {
-        $client = new Client(sprintf('%s://%s:%s', $config['protocol'], $config['host'], $config['port']));
+        $client = new \Redis();
+        $client->client($config['host'], $config['port']);
 
         return new RedisCachePool($client);
     }
@@ -42,11 +42,9 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
         $resolver->setDefaults([
             'host'     => '127.0.0.1',
             'port'     => '6379',
-            'protocol' => 'tcp',
         ]);
 
         $resolver->setAllowedTypes('host', ['string']);
         $resolver->setAllowedTypes('port', ['string', 'int']);
-        $resolver->setAllowedTypes('protocol', ['string']);
     }
 }

src/Resources/config/services.yml

@@ -11,8 +11,8 @@ services:
     class: Cache\AdapterBundle\Factory\FilesystemFactory
   cache.factory.memcached:
     class: Cache\AdapterBundle\Factory\MemcachedFactory
-  cache.factory.phpredis:
-    class: Cache\AdapterBundle\Factory\PhpRedisFactory
+  cache.factory.predis:
+    class: Cache\AdapterBundle\Factory\PredisFactory
   cache.factory.redis:
     class: Cache\AdapterBundle\Factory\RedisFactory
   cache.factory.void: