Merge pull request #38 from Nyholm/cleanup

Clean up and minor fixes

Author: Nyholm

README.md

@@ -196,6 +196,9 @@ php app/console cache:flush doctrine
 
 echo "Or you could run:"
 php app/console cache:flush all
+
+echo "Run the following command to see all your options:"
+php app/console cache:flush help
 ```
 
 *Caution: If you are using a implementation that does not support tagging you will clear all with any of the above commands.*

src/Cache/LoggingCachePool.php

@@ -11,7 +11,6 @@
 
 namespace Cache\CacheBundle\Cache;
 
-use Monolog\Logger;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -22,7 +21,7 @@
 class LoggingCachePool extends RecordingCachePool
 {
     /**
-     * @type Logger
+     * @type LoggerInterface
      */
     private $logger;
 

src/DependencyInjection/CacheExtension.php

@@ -89,7 +89,7 @@ public function load(array $configs, ContainerBuilder $container)
                 ->setDecoratedService('router', null, 10)
                 ->addArgument(new Reference($config['router']['service_id']))
                 ->addArgument(new Reference('cache.service.router.inner'))
-                ->addArgument($config['router']['ttl']);
+                ->addArgument($config['router']);
         }
 
         if ($container->getParameter('kernel.debug')) {

src/DependencyInjection/Compiler/DoctrineCompilerPass.php

@@ -11,7 +11,7 @@
 
 namespace Cache\CacheBundle\DependencyInjection\Compiler;
 
-use Cache\CacheBundle\Cache\FixedTaggingCachePool;
+use Cache\Bridge\DoctrineCacheBridge;
 use Cache\CacheBundle\Factory\DoctrineBridgeFactory;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -73,7 +73,7 @@ protected function enableDoctrineSupport(array $config)
 
                 // Doctrine can't talk to a PSR-6 cache, so we need a bridge
                 $bridgeServiceId = sprintf('cache.service.doctrine.%s.%s.bridge', $cacheType, $type);
-                $this->container->register($bridgeServiceId, FixedTaggingCachePool::class)
+                $this->container->register($bridgeServiceId, DoctrineCacheBridge::class)
                     ->setPublic(false)
                     ->setFactory([DoctrineBridgeFactory::class, 'get'])
                     ->addArgument(new Reference($typeConfig['service_id']))

src/Routing/CachingRouter.php

@@ -39,12 +39,12 @@ class CachingRouter implements RouterInterface
     /**
      * @param CacheItemPoolInterface $cache
      * @param RouterInterface        $router
-     * @param $ttl
+     * @param array                  $config
      */
-    public function __construct(CacheItemPoolInterface $cache, RouterInterface $router, $ttl)
+    public function __construct(CacheItemPoolInterface $cache, RouterInterface $router, array $config)
     {
         $this->cache  = $cache;
-        $this->ttl    = $ttl;
+        $this->ttl    = $config['ttl'];
         $this->router = $router;
     }