Changed bundle alias and service ids

Author: Nyholm

README.md

@@ -6,7 +6,7 @@ This bundle registers PSR6 cache services that wraps the doctrine cache.
 
 ```yaml
 
-doctrine_cache:
+cache_adapter_doctrine:
   providers:
     acme_file_system_cache:
       extension: '.fsc'
@@ -20,7 +20,7 @@ doctrine_cache:
 ``` php
 
 /** @var CacheItemPoolInterface $cacheProvider */
-$cacheProvider = $this->container->get('doctrine.acme_apc_cache');
+$cacheProvider = $this->container->get('cache.provider.acme_apc_cache');
 
 /** @var CacheItemInterface $item */
 $item = $cacheProvider->getItem('cache-key');

src/DependencyInjection/CompilerPass/ServiceBuilderPass.php

@@ -21,7 +21,7 @@ class ServiceBuilderPass implements CompilerPassInterface
             'connect' => 'addServer',
         ],
         'memcached' => [
-            'class' => 'Cache\DoctrineCacheBundle\Cache\Memcached',
+            'class' => 'Cache\DoctrineCacheBundle\ProviderHelper\Memcached',
             'connect' => 'addServer',
         ],
         'redis' => [
@@ -67,7 +67,7 @@ public function process(ContainerBuilder $container)
     private function createPsr7CompliantService(ContainerBuilder $container, $typeServiceId, $name)
     {
         // This is the service id for the PSR6 provider. This is the one that we use.
-        $serviceId = 'doctrine_cache.provider.'.$name;
+        $serviceId = 'cache_adapter_doctrine.provider.'.$name;
 
         // Register the CacheItemPoolInterface definition
         $def = $container->setDefinition(
@@ -76,7 +76,7 @@ private function createPsr7CompliantService(ContainerBuilder $container, $typeSe
         );
         $def->addArgument(0, new Reference($typeServiceId));
 
-        $container->setAlias('doctrine_cache.'.$name, $serviceId);
+        $container->setAlias('cache.provider.'.$name, $serviceId);
     }
 
     /**
@@ -101,15 +101,15 @@ private function prepareDoctrineCacheClass(ContainerBuilder $container, $typeSer
             case 'memcached':
             case 'redis':
             if (!empty($provider['id'])) {
-                $cacheProviderServiceId = $provider['id'];
+                $providerHelperServiceId = $provider['id'];
             } else {
                 // Create a new cache provider if none is defined
-                $cacheProviderServiceId = sprintf('doctrine_cache.provider.%s.cache_provider', $name);
-                $cacheProviderDefinition = $this->createCacheProviderDefinition($type, $provider);
-                $container->setDefinition($cacheProviderServiceId, $cacheProviderDefinition);
+                $providerHelperServiceId = sprintf('cache_adapter_doctrine.provider.%s.helper', $name);
+                $providerHelperDefinition = $this->createProviderHelperDefinition($type, $provider);
+                $container->setDefinition($providerHelperServiceId, $providerHelperDefinition);
             }
 
-            $service->addMethodCall(sprintf('set%s', ucwords($type)), [new Reference($cacheProviderServiceId)]);
+            $service->addMethodCall(sprintf('set%s', ucwords($type)), [new Reference($providerHelperServiceId)]);
 
             break;
             case 'file_system':
@@ -140,9 +140,10 @@ private function prepareDoctrineCacheClass(ContainerBuilder $container, $typeSer
      *
      * @return Definition
      */
-    public function createCacheProviderDefinition($type, array $provider)
+    public function createProviderHelperDefinition($type, array $provider)
     {
-        $cache = new Definition(self::$types[$type]['class']);
+        $helperDefinition = new Definition(self::$types[$type]['class']);
+        $helperDefinition->setPublic(false);
 
         // set memcached options first as they need to be set before the servers are added.
         if ($type === 'memcached') {
@@ -157,7 +158,7 @@ public function createCacheProviderDefinition($type, array $provider)
                             );
                             break;
                     }
-                    $cache->addMethodCall(
+                    $helperDefinition->addMethodCall(
                         'setOption',
                         [constant(sprintf('\Memcached::OPT_%s', strtoupper($option))), $value]
                     );
@@ -172,7 +173,7 @@ public function createCacheProviderDefinition($type, array $provider)
                 $persistentId = substr(md5(serialize($provider['hosts'])), 0, 5);
             }
             if ($type === 'memcached') {
-                $cache->setArguments([$persistentId]);
+                $helperDefinition->setArguments([$persistentId]);
             }
             if ($type === 'redis') {
                 self::$types[$type]['connect'] = 'pconnect';
@@ -193,19 +194,19 @@ public function createCacheProviderDefinition($type, array $provider)
                 }
             }
 
-            $cache->addMethodCall(self::$types[$type]['connect'], $arguments);
+            $helperDefinition->addMethodCall(self::$types[$type]['connect'], $arguments);
         }
         unset($config);
 
         if ($type === 'redis') {
             if (isset($provider['auth_password']) && null !== $provider['auth_password']) {
-                $cache->addMethodCall('auth', [$provider['auth_password']]);
+                $helperDefinition->addMethodCall('auth', [$provider['auth_password']]);
             }
             if (isset($provider['database'])) {
-                $cache->addMethodCall('select', [$provider['database']]);
+                $helperDefinition->addMethodCall('select', [$provider['database']]);
             }
         }
 
-        return $cache;
+        return $helperDefinition;
     }
 }

src/DependencyInjection/Configuration.php

@@ -21,7 +21,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('doctrine_cache');
+        $rootNode = $treeBuilder->root('cache_adapter_doctrine');
 
         $rootNode->children()
             ->append($this->getClustersNode())

src/DependencyInjection/DoctrineCacheExtension.php

@@ -28,14 +28,14 @@ public function load(array $configs, ContainerBuilder $container)
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
 
-        $container->setParameter('doctrine_cache.providers', $config['providers']);
+        $container->setParameter('cache_adapter_doctrine.providers', $config['providers']);
     }
 
     /**
      * {@inheritdoc}
      */
     public function getAlias()
     {
-        return 'doctrine_cache';
+        return 'cache_adapter_doctrine';
     }
 }

src/Cache/Memcached.php src/ProviderHelper/Memcached.phpsrc/Cache/Memcached.php renamed to src/ProviderHelper/Memcached.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Cache\DoctrineCacheBundle\Cache;
+namespace Cache\DoctrineCacheBundle\ProviderHelper;
 
 /**
  * Class Memcached.

tests/DependencyInjection/DoctrineCacheExtensionTest.php

@@ -20,6 +20,6 @@ public function testThatProvidersExists()
         $providers = array('foo' => ['type'=>'apc']);
         $this->load(array('providers' => $providers));
 
-        $this->assertContainerBuilderHasParameter('doctrine_cache.providers');
+        $this->assertContainerBuilderHasParameter('cache_adapter_doctrine.providers');
     }
 }