Merge pull request #4 from Nyholm/patch-1

Added options resolver

Author: Nyholm

composer.json

@@ -20,7 +20,8 @@
     "require":      {
         "php":                      "^5.5|^7",
         "symfony/framework-bundle": "^2.6|^3.0",
-        "cache/doctrine-adapter":   "^0.3"
+        "symfony/options-resolver": "^2.6|^3.0",
+        "psr/cache":                "1.0.0"
     },
     "require-dev":  {
         "phpunit/phpunit":                                  "5.0.*|^4.0",
@@ -29,6 +30,11 @@
         "cache/redis-adapter": "@stable",
         "cache/memcached-adapter": "@stable"
     },
+    "suggest":      {
+        "cache/doctrine-adapter": "To integrate with doctrine/cache",
+        "cache/redis-adapter": "Redis adapter",
+        "cache/memcached-adapter": "Memcached adapter"
+    },
     "autoload":     {
         "psr-4": {
             "Cache\\AdapterBundle\\": "src/"

src/DependencyInjection/CacheAdapterExtension.php

@@ -38,7 +38,7 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('services.yml');
 
         // Configure client services
-        $first = isset($providers['default']) ? 'default' : null;
+        $first = isset($config['providers']['default']) ? 'default' : null;
         foreach ($config['providers'] as $name => $arguments) {
             if ($first === null) {
                 $first = $name;

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,48 @@
 
 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.
-
-        $redis = new \Redis();
-        $redis->connect('127.0.0.1', '6379');
+        $config = $this->configureOptions($options);
+        $redis  = new \Redis();
+        $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);
+    }
 }

src/Resources/config/services.yml

@@ -1,16 +1,3 @@
-
-parameters:
-  cache.doctrine_adapter.apc.class: Doctrine\Common\Cache\ApcCache
-  cache.doctrine_adapter.array.class: Doctrine\Common\Cache\ArrayCache
-  cache.doctrine_adapter.file_system.class: Doctrine\Common\Cache\FilesystemCache
-  cache.doctrine_adapter.memcache.class: Doctrine\Common\Cache\MemcacheCache
-  cache.doctrine_adapter.memcached.class: Doctrine\Common\Cache\MemcachedCache
-  cache.doctrine_adapter.redis.class: Doctrine\Common\Cache\RedisCache
-  cache.doctrine_adapter.php_file.class: Doctrine\Common\Cache\PhpFileCache
-  cache.doctrine_adapter.win_cache.class: Doctrine\Common\Cache\WinCacheCache
-  cache.doctrine_adapter.xcache.class: Doctrine\Common\Cache\XcacheCache
-  cache.doctrine_adapter.zend_data.class: Doctrine\Common\Cache\ZendDataCache
-
 services:
   cache.factory.redis:
     class: Cache\AdapterBundle\Factory\RedisFactory