Removed router.yml

Author: Nyholm

src/Cache/FixedTaggingCachePool.php

@@ -16,7 +16,7 @@
 use Psr\Cache\CacheItemPoolInterface;
 
 /**
- * This class is a decorator for a TaggablePoolInterface. It tags everything with 'doctrine'.
+ * This class is a decorator for a TaggablePoolInterface. It tags everything with predefined tags.
  * Use this class with the DoctrineBridge.
  *
  * @author Tobias Nyholm <[email protected]>

src/CacheBundle.php

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

src/DependencyInjection/CacheExtension.php

@@ -16,6 +16,7 @@
 use Cache\CacheBundle\Bridge\SymfonyValidatorBridge;
 use Cache\CacheBundle\Factory\DoctrineBridgeFactory;
 use Cache\CacheBundle\Factory\ValidationFactory;
+use Cache\CacheBundle\Routing\CachingRouter;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader;
@@ -47,6 +48,10 @@ public function load(array $configs, ContainerBuilder $container)
             }
         }
 
+        if ($config['doctrine']['enabled']) {
+            $this->verifyDoctrineBridgeExists('doctrine');
+        }
+
         if ($config['annotation']['enabled']) {
             $this->verifyDoctrineBridgeExists('annotation');
             $container->register('cache.service.annotation', DoctrineCacheBridge::class)
@@ -80,11 +85,11 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if ($config['router']['enabled']) {
-            $loader->load('router.yml');
-            $container->getDefinition('cache.router')
+            $container->register('cache.service.router', CachingRouter::class)
                 ->setDecoratedService('router', null, 10)
-                ->replaceArgument(0, new Reference($config['router']['service_id']))
-                ->replaceArgument(2, $config['router']['ttl']);
+                ->addArgument(new Reference($config['router']['service_id']))
+                ->addArgument(new Reference('cache.service.router.inner'))
+                ->addArgument($config['router']['ttl']);
         }
 
         if ($container->getParameter('kernel.debug')) {
@@ -93,7 +98,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         $serviceIds = [];
         $this->findServiceIds($config, $serviceIds);
-        $container->setParameter('cache.provider.serviceIds', $serviceIds);
+        $container->setParameter('cache.provider_service_ids', $serviceIds);
     }
 
     /**

src/DependencyInjection/Compiler/CacheTaggingPass.php

@@ -27,7 +27,7 @@ class CacheTaggingPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         // get service ids form parameters
-        $serviceIds = $container->getParameter('cache.provider.serviceIds');
+        $serviceIds = $container->getParameter('cache.provider_service_ids');
 
         foreach ($serviceIds as $id) {
             $def = $container->findDefinition($id);

src/DependencyInjection/Compiler/DoctrineSupportCompilerPass.php renamed to src/DependencyInjection/Compiler/DoctrineCompilerPass.php

@@ -11,7 +11,6 @@
 
 namespace Cache\CacheBundle\DependencyInjection\Compiler;
 
-use Cache\Bridge\DoctrineCacheBridge;
 use Cache\CacheBundle\Cache\FixedTaggingCachePool;
 use Cache\CacheBundle\Factory\DoctrineBridgeFactory;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
@@ -25,7 +24,7 @@
  * @author Aaron Scherer <[email protected]>
  * @author Tobias Nyholm <[email protected]>
  */
-class DoctrineSupportCompilerPass implements CompilerPassInterface
+class DoctrineCompilerPass implements CompilerPassInterface
 {
     /**
      * @type ContainerBuilder
@@ -52,12 +51,6 @@ public function process(ContainerBuilder $container)
             );
         }
 
-        if (!class_exists('Cache\Bridge\DoctrineCacheBridge')) {
-            throw new \Exception(
-                'You need the DoctrineBridge to be able to cache queries, results and metadata. Please run "composer require cache/psr-6-doctrine-bridge" to install the missing dependency.'
-            );
-        }
-
         $this->enableDoctrineSupport($this->container->getParameter('cache.doctrine'));
     }