Merge pull request #56 from Nyholm/patch

[WIP]

Author: cryptiklemur

src/Command/CacheFlushCommand.php

@@ -8,8 +8,8 @@
 
 namespace Aequasi\Bundle\CacheBundle\Command;
 
+use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Aequasi\Bundle\CacheBundle\Service\CacheService;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
@@ -37,10 +37,10 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $serviceName = 'aequasi_cache.instance.' . $input->getArgument('instance');
+        $serviceName = sprintf('aequasi_cache.instance.%s.bridge', $input->getArgument('instance'));
 
-        /** @var CacheService $service */
+        /** @var CacheItemPoolInterface $service */
         $service = $this->getContainer()->get($serviceName);
-        $service->flushAll();
+        $service->clear();
     }
 }

src/DependencyInjection/Builder/ServiceBuilder.php

@@ -100,7 +100,7 @@ private function buildService($typeId, $name, array $instance)
             ->setPublic(false);
 
         // Create the CacheItemPoolInterface object, Logging or not
-        $service = $this->container->setDefinition(
+        $this->container->setDefinition(
             $serviceId,
             new Definition($this->getCachePoolClassName(), [new Reference($coreName)])
         );

src/DependencyInjection/Compiler/DoctrineSupportCompilerPass.php

@@ -65,6 +65,8 @@ protected function enableDoctrineSupport(array $config)
                             $manager,
                             $cacheType
                         );
+
+                    // Replace the doctrine entity manager cache with our bridge
                     $this->container->setAlias($doctrineDefinitionName, $cacheDefinitionName);
                 }
             }

src/DependencyInjection/Compiler/RouterCompilerPass.php

@@ -32,6 +32,6 @@ protected function prepare()
 
         $def = $this->container->findDefinition('router');
         $def->setClass('Aequasi\Bundle\CacheBundle\Routing\Router');
-        $def->addMethodCall('setCache', [new Reference('aequasi_cache.instance.' . $instance)]);
+        $def->addMethodCall('setCache', [new Reference(sprintf('aequasi_cache.instance.%s.bridge', $instance))]);
     }
 }

src/Exception/BadMethodException.php

@@ -1,53 +1,41 @@
-parameters:
-    aequasi_cache.abstract.apc.class: Doctrine\Common\Cache\ApcCache
-    aequasi_cache.abstract.array.class: Doctrine\Common\Cache\ArrayCache
-    aequasi_cache.abstract.file_system.class: Doctrine\Common\Cache\FilesystemCache
-    aequasi_cache.abstract.memcache.class: Doctrine\Common\Cache\MemcacheCache
-    aequasi_cache.abstract.memcached.class: Doctrine\Common\Cache\MemcachedCache
-    aequasi_cache.abstract.redis.class: Doctrine\Common\Cache\RedisCache
-    aequasi_cache.abstract.php_file.class: Doctrine\Common\Cache\PhpFileCache
-    aequasi_cache.abstract.win_cache.class: Doctrine\Common\Cache\WinCacheCache
-    aequasi_cache.abstract.xcache.class: Doctrine\Common\Cache\XcacheCache
-    aequasi_cache.abstract.zend_data.class: Doctrine\Common\Cache\ZendDataCache
-    aequasi_cache.session.handler.class: Aequasi\Bundle\CacheBundle\Session\SessionHandler
 
 services:
     aequasi_cache.abstract.apc:
-        class: %aequasi_cache.abstract.apc.class%
+        class: Doctrine\Common\Cache\ApcCache
         abstract: true
 
     aequasi_cache.abstract.array:
-        class: %aequasi_cache.abstract.array.class%
+        class: Doctrine\Common\Cache\ArrayCache
         abstract: true
 
     aequasi_cache.abstract.file_system:
-        class: %aequasi_cache.abstract.file_system.class%
+        class: Doctrine\Common\Cache\FilesystemCache
         abstract: true
 
     aequasi_cache.abstract.memcache:
-        class: %aequasi_cache.abstract.memcache.class%
+        class: Doctrine\Common\Cache\MemcacheCache
         abstract: true
 
     aequasi_cache.abstract.memcached:
-        class: %aequasi_cache.abstract.memcached.class%
+        class: Doctrine\Common\Cache\MemcachedCache
         abstract: true
 
     aequasi_cache.abstract.redis:
-        class: %aequasi_cache.abstract.redis.class%
+        class: Doctrine\Common\Cache\RedisCache
         abstract: true
 
     aequasi_cache.abstract.php_file:
-        class: %aequasi_cache.abstract.php_file.class%
+        class: Doctrine\Common\Cache\PhpFileCache
         abstract: true
 
     aequasi_cache.abstract.win_cache:
-        class: %aequasi_cache.abstract.win_cache.class%
+        class: Doctrine\Common\Cache\WinCacheCache
         abstract: true
 
     aequasi_cache.abstract.xcache:
-        class: %aequasi_cache.abstract.xcache.class%
+        class: Doctrine\Common\Cache\XcacheCache
         abstract: true
 
     aequasi_cache.zend_data:
-        class: %aequasi_cache.abstract.zend_data.class%
+        class: Doctrine\Common\Cache\ZendDataCache
         abstract: true