Merge branch 'master' of https://github.com/php-cache/cache-bundle

Author: Nyholm

src/Cache/LoggingCachePool.php

@@ -14,6 +14,7 @@
 use Aequasi\Cache\CacheItem;
 use Aequasi\Cache\CachePool;
 use Psr\Cache\CacheItemInterface;
+use Psr\Cache\CacheItemPoolInterface;
 
 /**
  * @author Aaron Scherer <[email protected]>
@@ -25,6 +26,21 @@ class LoggingCachePool extends CachePool
      */
     private $calls = [];
 
+    /**
+     * @type CacheItemPoolInterface
+     */
+    private $cachePool;
+
+    /**
+     * LoggingCachePool constructor.
+     *
+     * @param CacheItemPoolInterface $cachePool
+     */
+    public function __construct(CacheItemPoolInterface $cachePool)
+    {
+        $this->cachePool = $cachePool;
+    }
+
     public function getItem($key)
     {
         $call         = $this->timeCall(__FUNCTION__, [$key]);
@@ -73,7 +89,7 @@ public function save(CacheItemInterface $item)
     private function timeCall($name, $arguments)
     {
         $start  = microtime(true);
-        $result = call_user_func_array(['parent', $name], $arguments);
+        $result = call_user_func_array([$this->cachePool, $name], $arguments);
         $time   = microtime(true) - $start;
 
         $object = (object) compact('name', 'arguments', 'start', 'time', 'result');

src/DependencyInjection/CacheExtension.php

@@ -11,8 +11,10 @@
 
 namespace Cache\CacheBundle\DependencyInjection;
 
+use Cache\CacheBundle\Cache\LoggingCachePool;
 use Cache\CacheBundle\DataCollector\CacheDataCollector;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
@@ -33,6 +35,8 @@ public function load(array $configs, ContainerBuilder $container)
         $config = $this->processConfiguration(new Configuration(), $configs);
 
         if ($container->getParameter('kernel.debug')) {
+            $this->transformLoggableCachePools($container);
+
             $container->register('data_collector.cache', CacheDataCollector::class)
                 ->addTag('data_collector', ['template' => CacheDataCollector::TEMPLATE, 'id' => 'cache']);
         }
@@ -42,10 +46,23 @@ public function load(array $configs, ContainerBuilder $container)
                 $container->setParameter($this->getAlias().'.'.$section, $config[$section]);
             }
         }
+
     }
 
     public function getAlias()
     {
         return 'cache';
     }
+
+    private function transformLoggableCachePools(ContainerBuilder $container)
+    {
+        $serviceIds = $container->findTaggedServiceIds('cache.provider');
+        foreach (array_keys($serviceIds) as $id) {
+            $container->setDefinition($id.'.logged', $container->findDefinition($id));
+            $def = $container->register($id.'.logger', LoggingCachePool::class);
+            $def->addArgument(new Reference($id));
+
+            $container->setAlias($id, $id.'.logger');
+        }
+    }
 }