Output number of invalidation requests to console

Improve PHPDocs

Author: ddeboer

EventListener/InvalidationListener.php

@@ -12,7 +12,6 @@
 use Symfony\Component\ExpressionLanguage\SyntaxError;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\PostResponseEvent;
 use Symfony\Component\Routing\RouterInterface;
@@ -128,23 +127,35 @@ public function onKernelTerminate(PostResponseEvent $event)
     }
 
     /**
-     * Flush cache manager on console termination and exception
+     * Flush cache manager when kernel exception occurs
      */
-    public function onTerminate()
+    public function onKernelException()
     {
         $this->cacheManager->flush();
     }
 
+    /**
+     * Flush cache manager when console terminates or errors
+     */
+    public function onConsoleTerminate(ConsoleEvent $event)
+    {
+        $num = $this->cacheManager->flush();
+
+        if ($num > 0 && $event->getInput()->getOption('verbose')) {
+            $event->getOutput()->writeln(sprintf('Sent %d invalidation requests', $num));
+        }
+    }
+
     /**
      * {@inheritdoc}
      */
     public static function getSubscribedEvents()
     {
         return array(
             KernelEvents::TERMINATE  => 'onKernelTerminate',
-            KernelEvents::EXCEPTION  => 'onTerminate',
-            ConsoleEvents::TERMINATE => 'onTerminate',
-            ConsoleEvents::EXCEPTION => 'onTerminate'
+            KernelEvents::EXCEPTION  => 'onKernelException',
+            ConsoleEvents::TERMINATE => 'onConsoleTerminate',
+            ConsoleEvents::EXCEPTION => 'onConsoleTerminate'
         );
     }
 

Tests/EventListener/InvalidationListenerTest.php

@@ -125,11 +125,15 @@ public function testInvalidateRoute()
         $this->getListener()->onKernelTerminate($event);
     }
 
-    public function testOnTerminate()
+    public function testOnConsoleTerminate()
     {
-        $this->cacheManager->shouldReceive('flush')->once();
+        $this->cacheManager->shouldReceive('flush')->once()->andReturn(2);
 
-        $this->getListener()->onTerminate();
+        $event = \Mockery::mock('\Symfony\Component\Console\Event\ConsoleEvent');
+        $event->shouldReceive('getInput->getOption')->with('verbose')->andReturn(true);
+        $event->shouldReceive('getOutput->writeln')->with('Sent 2 invalidation requests')->once();
+
+        $this->getListener()->onConsoleTerminate($event);
     }
 
     protected function getEvent(Request $request, Response $response = null)