Fixing conflict

Author: cryptiklemur

composer.json

@@ -30,11 +30,12 @@
         "psr/cache":                "1.0.x-dev"
     },
     "require-dev":  {
-        "phpunit/phpunit":      "^5.1|^4.0",
-        "cache/doctrine-cache": "^0.1"
+        "phpunit/phpunit":        "^5.1|^4.0",
+        "cache/doctrine-adapter": "^0.1",
+        "cache/taggable-cache":   "^0.1"
     },
     "suggest":      {
-        "php-cache/doctrine-adapter-bundle": "A bundle to register PSR-6 compliant services based on Doctrine cache"
+        "cache/doctrine-adapter-bundle": "A bundle to register PSR-6 compliant services based on Doctrine cache"
     },
     "autoload":     {
         "psr-4": {

phpunit.xml.dist

@@ -9,7 +9,7 @@
   processIsolation="false"
   stopOnFailure="false"
   syntaxCheck="false"
-  bootstrap="tests/bootstrap.php"
+  bootstrap="vendor/autoload.php"
   >
   <testsuites>
     <testsuite name="CacheBundle for the Symfony2 Framework">

src/CacheBundle.php

@@ -31,7 +31,6 @@ public function build(ContainerBuilder $container)
 
         $container->addCompilerPass(new Compiler\SessionSupportCompilerPass());
         $container->addCompilerPass(new Compiler\DoctrineSupportCompilerPass());
-        $container->addCompilerPass(new Compiler\RouterCompilerPass());
 
         if ($container->getParameter('kernel.debug')) {
             $container->addCompilerPass(new Compiler\DataCollectorCompilerPass());

src/DependencyInjection/CacheExtension.php

@@ -11,16 +11,17 @@
 
 namespace Cache\CacheBundle\DependencyInjection;
 
-use Cache\CacheBundle\Cache\LoggingCachePool;
-use Cache\CacheBundle\DataCollector\CacheDataCollector;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Loader;
+
 
 /**
- * Class AequasiCacheExtension
  *
  * @author Aaron Scherer <aequasi@gmail.com>
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
 class CacheExtension extends Extension
 {
@@ -34,17 +35,24 @@ public function load(array $configs, ContainerBuilder $container)
     {
         $config = $this->processConfiguration(new Configuration(), $configs);
 
-        if ($container->getParameter('kernel.debug')) {
-            $container->register('data_collector.cache', CacheDataCollector::class)
-                ->addTag('data_collector', ['template' => CacheDataCollector::TEMPLATE, 'id' => 'cache']);
-        }
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader->load('services.yml');
 
         foreach (['router', 'session', 'doctrine'] as $section) {
             if ($config[$section]['enabled']) {
                 $container->setParameter('cache.'.$section, $config[$section]);
             }
         }
 
+        if ($config['router']['enabled']) {
+            $container->getDefinition('cache.router_listener')->replaceArgument(0, new Reference($config['router']['service_id']));
+        } else {
+            $container->removeDefinition('cache.router_listener');
+        }
+
+        if (!$container->getParameter('kernel.debug')) {
+            $container->removeDefinition('data_collector.cache');
+        }
     }
 
     public function getAlias()

src/DependencyInjection/Compiler/RouterCompilerPass.php

@@ -42,7 +42,7 @@ public function getConfigTreeBuilder()
     }
 
     /**
-     * Configure the "aequasi_cache.session" section
+     * Configure the "cache.session" section
      *
      * @return ArrayNodeDefinition
      */
@@ -69,7 +69,7 @@ private function addSessionSupportSection()
     }
 
     /**
-     * Configure the "aequasi_cache.doctrine" section
+     * Configure the "cache.doctrine" section
      *
      * @return ArrayNodeDefinition
      */
@@ -127,7 +127,7 @@ function ($v) {
     }
 
     /**
-     * Configure the "aequasi_cache.router" section
+     * Configure the "cache.router" section
      *
      * @return ArrayNodeDefinition
      */
@@ -142,10 +142,7 @@ private function addRouterSection()
                     ->defaultFalse()
                 ->end()
                 ->integerNode('ttl')
-                    ->defaultValue(86400)
-                ->end()
-                ->booleanNode('auto-register')
-                    ->defaultTrue()
+                    ->defaultValue(604800)
                 ->end()
                 ->scalarNode('service_id')
                     ->isRequired()

src/DependencyInjection/Configuration.php

@@ -0,0 +1,12 @@
+services:
+  data_collector.cache:
+    class: Cache\CacheBundle\DataCollector\CacheDataCollector
+    tags:
+      - { name: data_collectorr, template: 'CacheBundle:Collector:cache.html.twig', id: 'cache' }
+
+  cache.router_listener:
+    class: Cache\CacheBundle\Routing\RouterListener
+    arguments: [~, %cache.router.ttl%]
+    tags:
+      - { name: kernel.event_listener, event: kernel.request, method: onBeforeRouting, priority: 33 }
+      - { name: kernel.event_listener, event: kernel.request, method: onAfterRouting, priority: 31 }