Merge pull request #10 from aequasi/master

Adding default cache alias as `cache`

Author: Nyholm

README.md

@@ -70,6 +70,8 @@ Use the new service as any PSR-6 cache.
 ``` php
 /** @var CacheItemPoolInterface $cache */
 $cache = $this->container->get('cache.provider.acme_apc_cache');
+// Or
+$cache = $this->container->get('cache'); // This is either the `default` provider, or the first provider in the config
 
 /** @var CacheItemInterface $item */
 $item = $cache->getItem('cache-key');

src/DependencyInjection/DoctrineAdapterExtension.php

@@ -32,7 +32,7 @@ class DoctrineAdapterExtension extends Extension
      * @type array
      */
     protected static $types = [
-        'memcache' => [
+        'memcache'  => [
             'class'   => 'Memcache',
             'connect' => 'addServer',
             'port'    => 11211,
@@ -42,7 +42,7 @@ class DoctrineAdapterExtension extends Extension
             'connect' => 'addServer',
             'port'    => 11211,
         ],
-        'redis' => [
+        'redis'     => [
             'class'   => 'Redis',
             'connect' => 'connect',
             'port'    => 6379,
@@ -77,7 +77,12 @@ protected function process(ContainerBuilder $container)
     {
         $providers = $container->getParameter('cache_adapter_doctrine.providers');
 
+        $first = isset($providers['default']) ? 'default' : null;
         foreach ($providers as $name => $provider) {
+            if ($first === null) {
+                $first = $name;
+            }
+
             $classParameter    = sprintf('cache.doctrine_adapter.%s.class', $provider['type']);
             $doctrineServiceId = sprintf('cache.doctrine_adapter.doctrine_service.%s', $provider['type']);
             if (!$container->hasParameter($classParameter)) {
@@ -94,6 +99,8 @@ protected function process(ContainerBuilder $container)
             $this->createDoctrineCacheDefinition($container, $doctrineServiceId, $doctrineClass, $name, $provider);
             $this->createPsr7CompliantService($container, $doctrineServiceId, $name);
         }
+
+        $container->setAlias('cache', 'cache.doctrine_adapter.provider.'.$first);
     }
 
     /**
@@ -105,8 +112,13 @@ protected function process(ContainerBuilder $container)
      * @param string           $name
      * @param array            $provider
      */
-    protected function createDoctrineCacheDefinition(ContainerBuilder $container, $doctrineServiceId, $doctrineClass, $name, array $provider)
-    {
+    protected function createDoctrineCacheDefinition(
+        ContainerBuilder $container,
+        $doctrineServiceId,
+        $doctrineClass,
+        $name,
+        array $provider
+    ) {
         $namespace = is_null($provider['namespace']) ? $name : $provider['namespace'];
 
         // Create a service for the requested doctrine cache
@@ -145,8 +157,9 @@ protected function createDoctrineCacheDefinition(ContainerBuilder $container, $d
             case 'sqlite':
             case 'riak':
             case 'chain':
-                throw new \InvalidArgumentException(sprintf('The cache provider type "%s" is not yet implemented.', $type));
-                break;
+                throw new \InvalidArgumentException(
+                    sprintf('The cache provider type "%s" is not yet implemented.', $type)
+                );
         }
 
         // Add the definition to the container
@@ -177,7 +190,7 @@ protected function createPsr7CompliantService(ContainerBuilder $container, $doct
     /**
      * Creates a provider to the Doctrine cache provider.
      *
-     * @param $type
+     * @param       $type
      * @param array $provider
      *
      * @return Definition
@@ -245,7 +258,7 @@ public function getAlias()
 
     /**
      * @param array $provider
-     * @param $helperDefinition
+     * @param       $helperDefinition
      *
      * @return array
      */