Fixes

Author: Nyholm

src/DependencyInjection/CompilerPass/ServiceBuilderPass.php

@@ -40,29 +40,30 @@ public function process(ContainerBuilder $container)
         $providers = $container->getParameter('cache_adapter_doctrine.providers');
 
         foreach ($providers as $name => $provider) {
-            $typeServiceId = 'cache.doctrine_adapter.abstract.'.$provider['type'];
-            if (!$container->hasDefinition($typeServiceId)) {
+            $typeServiceId = sprintf('cache.doctrine_adapter.abstract.%s', $provider['type']);
+            $classParameter = sprintf('cache.doctrine_adapter.%s.class',$provider['type']);
+            if (!$container->hasParameter($classParameter)) {
                 throw new InvalidConfigurationException(
                     sprintf(
-                        '`%s` is not a valid cache type. If you are using a custom type, make sure to add your service. ',
-                        $provider['type']
+                        '"%s" is not a valid cache type. We cannot find a container parameter named "%s" with a class namespace as value. Make sure to add that or use any built in services',
+                        $provider['type'],
+                        $classParameter
                     )
                 );
             }
+            $class = $container->getParameter($classParameter);
 
-            $this->prepareDoctrineCacheClass($container, $typeServiceId, $name, $provider);
+            $this->createDoctrineCacheDefinition($container, $typeServiceId, $class, $name, $provider);
             $this->createPsr7CompliantService($container, $typeServiceId, $name);
         }
     }
 
     /**
-     * Make sure to create a PRS-6 service that wrapps the doctrine service.
+     * Make sure to create a PRS-6 service that wraps the doctrine service.
      *
-     * @param string $typeId
+     * @param ContainerBuilder $container
+     * @param string $typeServiceId
      * @param string $name
-     * @param array  $provider
-     *
-     * @return Definition
      */
     private function createPsr7CompliantService(ContainerBuilder $container, $typeServiceId, $name)
     {
@@ -80,16 +81,18 @@ private function createPsr7CompliantService(ContainerBuilder $container, $typeSe
     /**
      * We need to prepare the doctrine cache providers.
      *
-     * @param Definition $service
-     * @param string     $name
-     * @param array      $provider
+     * @param ContainerBuilder $container
+     * @param string $typeServiceId
+     * @param string $class
+     * @param string $name
+     * @param array $provider
      */
-    private function prepareDoctrineCacheClass(ContainerBuilder $container, $typeServiceId, $name, array $provider)
+    private function createDoctrineCacheDefinition(ContainerBuilder $container, $typeServiceId, $class, $name, array $provider)
     {
         $namespace = is_null($provider['namespace']) ? $name : $provider['namespace'];
 
-        // Modify the core doctrine cache class
-        $definition = $container->getDefinition($typeServiceId);
+        // Create a service for the requested doctrine cache
+        $definition = new Definition($class);
         $definition->addMethodCall('setNamespace', [$namespace])
             ->setPublic(false);
 
@@ -127,7 +130,7 @@ private function prepareDoctrineCacheClass(ContainerBuilder $container, $typeSer
                 break;
         }
 
-        // TODO is this line needed?
+        // Add the definition to the container
         $container->setDefinition($typeServiceId, $definition);
     }
 

src/Resources/config/services.yml

@@ -1,31 +1,12 @@
 
-services:
-    cache.doctrine_adapter.abstract.apc:
-        class: Doctrine\Common\Cache\ApcCache
-
-    cache.doctrine_adapter.abstract.array:
-        class: Doctrine\Common\Cache\ArrayCache
-
-    cache.doctrine_adapter.abstract.file_system:
-        class: Doctrine\Common\Cache\FilesystemCache
-
-    cache.doctrine_adapter.abstract.memcache:
-        class: Doctrine\Common\Cache\MemcacheCache
-
-    cache.doctrine_adapter.abstract.memcached:
-        class: Doctrine\Common\Cache\MemcachedCache
-
-    cache.doctrine_adapter.abstract.redis:
-        class: Doctrine\Common\Cache\RedisCache
-
-    cache.doctrine_adapter.abstract.php_file:
-        class: Doctrine\Common\Cache\PhpFileCache
-
-    cache.doctrine_adapter.abstract.win_cache:
-        class: Doctrine\Common\Cache\WinCacheCache
-
-    cache.doctrine_adapter.abstract.xcache:
-        class: Doctrine\Common\Cache\XcacheCache
-
-    cache.doctrine_adapter.zend_data:
-        class: Doctrine\Common\Cache\ZendDataCache
+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