Added option resolver

Author: Nyholm

src/Factory/AdapterFactoryInterface.php

@@ -11,7 +11,17 @@
 
 namespace Cache\AdapterBundle\Factory;
 
+use Psr\Cache\CacheItemPoolInterface;
+
+/**
+ * @author Tobias Nyholm <[email protected]>
+ */
 interface AdapterFactoryInterface
 {
+    /**
+     * @param array $options
+     *
+     * @return CacheItemPoolInterface
+     */
     public function createAdapter(array $options = []);
 }

src/Factory/DoctrineRedisFactory.php

@@ -13,24 +13,49 @@
 
 use Cache\Adapter\Doctrine\DoctrineCachePool;
 use Doctrine\Common\Cache\RedisCache;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @author Tobias Nyholm <[email protected]>
+ */
 class DoctrineRedisFactory implements AdapterFactoryInterface
 {
+    /**
+     * {@inheritdoc}
+     */
     public function createAdapter(array $options = [])
     {
         if (!class_exists('Cache\Adapter\Doctrine\DoctrineCachePool')) {
             throw new \LogicException('You must install the "cache/doctrine-adapter" package to use the "doctrine_redis" provider.');
         }
 
-        // TODO validate the options with symfony options resolver
-        // TODO get ip, port and protocol from options.
-
+        $config = $this->configureOptions($options);
         $redis = new \Redis();
-        $redis->connect('127.0.0.1', '6379');
+        $redis->connect($config['host'], $config['port']);
 
         $client = new RedisCache();
         $client->setRedis($redis);
 
         return new DoctrineCachePool($client);
     }
+
+
+    /**
+     * @param array $options
+     *
+     * @return array
+     */
+    private function configureOptions(array $options)
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefaults([
+            'host' => '127.0.0.1',
+            'port' => '6379',
+        ]);
+
+        $resolver->setAllowedTypes('host', ['string']);
+        $resolver->setAllowedTypes('port', ['string', 'int']);
+
+        return $resolver->resolve($options);
+    }
 }

src/Factory/RedisFactory.php

@@ -13,19 +13,46 @@
 
 use Cache\Adapter\Redis\RedisCachePool;
 use Predis\Client;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @author Tobias Nyholm <[email protected]>
+ */
 class RedisFactory implements AdapterFactoryInterface
 {
+    /**
+     * {@inheritdoc}
+     */
     public function createAdapter(array $options = [])
     {
         if (!class_exists('Cache\Adapter\Redis\RedisCachePool')) {
             throw new \LogicException('You must install the "cache/redis-adapter" package to use the "redis" provider.');
         }
 
-        // TOOD validate the options with symfony options resolver
-        // TODO get ip, port and protocol from options.
-        $client = new Client('tcp:/127.0.0.1:6379');
+        $config = $this->configureOptions($options);
+        $client = new Client(sprintf('%s://%s:%s', $config['protocol'], $config['host'], $config['port']));
 
         return new RedisCachePool($client);
     }
+
+    /**
+     * @param array $options
+     *
+     * @return array
+     */
+    private function configureOptions(array $options)
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefaults([
+            'host' => '127.0.0.1',
+            'port' => '6379',
+            'protocol' => 'tcp',
+        ]);
+
+        $resolver->setAllowedTypes('host', ['string']);
+        $resolver->setAllowedTypes('port', ['string', 'int']);
+        $resolver->setAllowedTypes('protocol', ['string']);
+
+        return $resolver->resolve($options);
+    }
 }