Merge pull request #22 from Nyholm/bugfixes

bugfixes

Author: Nyholm

README.md

@@ -129,13 +129,15 @@ If you want to clear the cache you can run the following commands.
 
 ```sh
 php app/console cache:flush session
-php app/console cache:flush routing
+php app/console cache:flush router
 php app/console cache:flush doctrine
 
-echo "Or you could run: "
+echo "Or you could run:"
 php app/console cache:flush all
 ```
 
+*Caution: If you are using a implementation that does not support tagging you will clear all with any of the above commands.*
+
 ### Need Help?
 
 Create an issue if you've found a bug, or ping one of us on twitter: @aequasi or @TobiasNyholm

src/Command/CacheFlushCommand.php

@@ -40,7 +40,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $validTypes = ['session', 'routing', 'doctrine'];
+        $validTypes = ['session', 'router', 'doctrine'];
         $type       = $input->getArgument('type');
         if ($type === 'all') {
             foreach ($validTypes as $type) {
@@ -67,10 +67,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
      */
     private function clearCacheForType($type)
     {
-        $serviceId = $this->getContainer()->getParameter(sprintf('cache.%s%.service_id', $type));
+        if (!$this->getContainer()->hasParameter(sprintf('cache.%s', $type))) {
+            return;
+        }
+
+        $config = $this->getContainer()->getParameter(sprintf('cache.%s', $type));
 
         /** @type CacheItemPoolInterface $service */
-        $service = $this->getContainer()->get($serviceId);
+        $service = $this->getContainer()->get($config['service_id']);
         if ($service instanceof TaggablePoolInterface) {
             $service->clear([$type]);
         } else {

src/Routing/CachingRouter.php

@@ -164,7 +164,7 @@ public function __call($method, $args)
     private function getCacheItemFromKey($key, $tag)
     {
         if ($this->cache instanceof TaggablePoolInterface) {
-            $item = $this->cache->getItem($key, ['routing', $tag]);
+            $item = $this->cache->getItem($key, ['router', $tag]);
         } else {
             $item = $this->cache->getItem($key);
         }