Bugfixes and improvements

Author: Nyholm

LICENSE

@@ -37,10 +37,10 @@ class ServiceBuilderPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        $providers = $container->getParameter('doctrine_cache.providers');
+        $providers = $container->getParameter('cache_adapter_doctrine.providers');
 
         foreach ($providers as $name => $provider) {
-            $typeServiceId = 'doctrine_cache.abstract.'.$provider['type'];
+            $typeServiceId = 'cache.doctrine_adapter.abstract.'.$provider['type'];
             if (!$container->hasDefinition($typeServiceId)) {
                 throw new InvalidConfigurationException(
                     sprintf(
@@ -70,11 +70,9 @@ private function createPsr7CompliantService(ContainerBuilder $container, $typeSe
         $serviceId = 'cache.doctrine_adapter.provider.'.$name;
 
         // Register the CacheItemPoolInterface definition
-        $def = $container->setDefinition(
-            $serviceId,
-            \Cache\Doctrine\CachePoolItem::class
-        );
-        $def->addArgument(0, new Reference($typeServiceId));
+        $def = new Definition(\Cache\Doctrine\CachePoolItem::class);
+        $def->addArgument(new Reference($typeServiceId));
+        $container->setDefinition($serviceId, $def);
 
         $container->setAlias('cache.provider.'.$name, $serviceId);
     }
@@ -91,8 +89,8 @@ private function prepareDoctrineCacheClass(ContainerBuilder $container, $typeSer
         $namespace = is_null($provider['namespace']) ? $name : $provider['namespace'];
 
         // Modify the core doctrine cache class
-        $service = $container->getDefinition($typeServiceId);
-        $service->addMethodCall('setNamespace', [$namespace])
+        $definition = $container->getDefinition($typeServiceId);
+        $definition->addMethodCall('setNamespace', [$namespace])
             ->setPublic(false);
 
         $type = $provider['type'];
@@ -109,8 +107,7 @@ private function prepareDoctrineCacheClass(ContainerBuilder $container, $typeSer
                 $container->setDefinition($providerHelperServiceId, $providerHelperDefinition);
             }
 
-            $service->addMethodCall(sprintf('set%s', ucwords($type)), [new Reference($providerHelperServiceId)]);
-
+            $definition->addMethodCall(sprintf('set%s', ucwords($type)), [new Reference($providerHelperServiceId)]);
             break;
             case 'file_system':
             case 'php_file':
@@ -119,8 +116,7 @@ private function prepareDoctrineCacheClass(ContainerBuilder $container, $typeSer
                     $directory = $provider['directory'];
                 }
                 $extension = is_null($provider['extension']) ? null : $provider['extension'];
-
-                $service->setArguments([$directory, $extension]);
+                $definition->setArguments([$directory, $extension]);
 
                 break;
             case 'mongo':
@@ -130,6 +126,9 @@ private function prepareDoctrineCacheClass(ContainerBuilder $container, $typeSer
             case 'chain':
                 break;
         }
+
+        // TODO is this line needed?
+        $container->setDefinition($typeServiceId, $definition);
     }
 
     /**

README.md

@@ -2,11 +2,30 @@
 
 namespace Cache\Adapter\DoctrineAdapterBundle;
 
+use Cache\Adapter\DoctrineAdapterBundle\DependencyInjection\CompilerPass\ServiceBuilderPass;
+use Cache\Adapter\DoctrineAdapterBundle\DependencyInjection\DoctrineAdapterExtension;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
 class DoctrineAdapterBundle extends Bundle
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function build(ContainerBuilder $container)
+    {
+        parent::build($container);
+        $container->addCompilerPass(new ServiceBuilderPass());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getContainerExtension()
+    {
+        return new DoctrineAdapterExtension();
+    }
 }

src/DependencyInjection/CompilerPass/ServiceBuilderPass.php

@@ -1,41 +1,31 @@
 
 services:
-    doctrine_cache.abstract.apc:
+    cache.doctrine_adapter.abstract.apc:
         class: Doctrine\Common\Cache\ApcCache
-        abstract: true
 
-    doctrine_cache.abstract.array:
+    cache.doctrine_adapter.abstract.array:
         class: Doctrine\Common\Cache\ArrayCache
-        abstract: true
 
-    doctrine_cache.abstract.file_system:
+    cache.doctrine_adapter.abstract.file_system:
         class: Doctrine\Common\Cache\FilesystemCache
-        abstract: true
 
-    doctrine_cache.abstract.memcache:
+    cache.doctrine_adapter.abstract.memcache:
         class: Doctrine\Common\Cache\MemcacheCache
-        abstract: true
 
-    doctrine_cache.abstract.memcached:
+    cache.doctrine_adapter.abstract.memcached:
         class: Doctrine\Common\Cache\MemcachedCache
-        abstract: true
 
-    doctrine_cache.abstract.redis:
+    cache.doctrine_adapter.abstract.redis:
         class: Doctrine\Common\Cache\RedisCache
-        abstract: true
 
-    doctrine_cache.abstract.php_file:
+    cache.doctrine_adapter.abstract.php_file:
         class: Doctrine\Common\Cache\PhpFileCache
-        abstract: true
 
-    doctrine_cache.abstract.win_cache:
+    cache.doctrine_adapter.abstract.win_cache:
         class: Doctrine\Common\Cache\WinCacheCache
-        abstract: true
 
-    doctrine_cache.abstract.xcache:
+    cache.doctrine_adapter.abstract.xcache:
         class: Doctrine\Common\Cache\XcacheCache
-        abstract: true
 
-    doctrine_cache.zend_data:
+    cache.doctrine_adapter.zend_data:
         class: Doctrine\Common\Cache\ZendDataCache
-        abstract: true

src/DoctrineAdapterBundle.php

@@ -1,25 +1,24 @@
 <?php
 
-namespace Cache\Adapter\DoctrineAdapterBundle\Tests\DependencyInjection;
+namespace Cache\Adapter\DoctrineAdapterBundle\tests\DependencyInjection;
 
 use Cache\Adapter\DoctrineAdapterBundle\DependencyInjection\DoctrineAdapterExtension;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
 
 class DoctrineCacheExtensionTest extends AbstractExtensionTestCase
 {
-
     protected function getContainerExtensions()
     {
         return array(
-            new DoctrineAdapterExtension()
+            new DoctrineAdapterExtension(),
         );
     }
 
     public function testThatProvidersExists()
     {
-        $providers = array('foo' => ['type'=>'apc']);
+        $providers = array('foo' => ['type' => 'apc']);
         $this->load(array('providers' => $providers));
 
         $this->assertContainerBuilderHasParameter('cache_adapter_doctrine.providers');
     }
-}
+}