use HttpKernelInterface

Author: dbu

src/SymfonyCache/CacheEvent.php

@@ -14,7 +14,7 @@
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * Event raised by the HttpCache kernel.
@@ -49,9 +49,9 @@ class CacheEvent extends Event
      * @param CacheInvalidation $kernel      the kernel raising with this event
      * @param Request           $request     the request being processed
      * @param Response          $response    the response, if available
-     * @param int               $requestType the request type (default KernelInterface::MASTER_REQUEST)
+     * @param int               $requestType the request type (default HttpKernelInterface::MASTER_REQUEST)
      */
-    public function __construct(CacheInvalidation $kernel, Request $request, Response $response = null, $requestType = KernelInterface::MASTER_REQUEST)
+    public function __construct(CacheInvalidation $kernel, Request $request, Response $response = null, $requestType = HttpKernelInterface::MASTER_REQUEST)
     {
         $this->kernel = $kernel;
         $this->request = $request;
@@ -80,7 +80,7 @@ public function getRequest()
     }
 
     /**
-     * Get the request type.
+     * One of the constants HttpKernelInterface::MASTER_REQUEST or SUB_REQUEST.
      *
      * @return int
      */

src/SymfonyCache/EventDispatchingHttpCache.php

@@ -17,7 +17,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\KernelInterface;
 
 /**
  * Trait for enhanced Symfony reverse proxy based on the symfony kernel component.
@@ -133,11 +132,11 @@ protected function invalidate(Request $request, $catch = false)
      * @param string        $name        Name of the event to trigger. One of the constants in FOS\HttpCache\SymfonyCache\Events
      * @param Request       $request
      * @param Response|null $response    If already available
-     * @param int           $requestType The request type (default KernelInterface::MASTER_REQUEST)
+     * @param int           $requestType The request type (default HttpKernelInterface::MASTER_REQUEST)
      *
      * @return Response The response to return, which might be provided/altered by a listener
      */
-    protected function dispatch($name, Request $request, Response $response = null, $requestType = KernelInterface::MASTER_REQUEST)
+    protected function dispatch($name, Request $request, Response $response = null, $requestType = HttpKernelInterface::MASTER_REQUEST)
     {
         if ($this->getEventDispatcher()->hasListeners($name)) {
             $event = new CacheEvent($this, $request, $response, $requestType);

tests/Unit/SymfonyCache/CacheEventTest.php

@@ -17,7 +17,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\KernelInterface;
 
 class CacheEventTest extends TestCase
 {
@@ -40,7 +39,7 @@ public function testEventGetters()
         $this->assertSame($this->kernel, $event->getKernel());
         $this->assertSame($request, $event->getRequest());
         $this->assertNull($event->getResponse());
-        $this->assertSame(KernelInterface::MASTER_REQUEST, $event->getRequestType());
+        $this->assertSame(HttpKernelInterface::MASTER_REQUEST, $event->getRequestType());
 
         $response = new Response();
 
@@ -49,6 +48,6 @@ public function testEventGetters()
         $this->assertSame($this->kernel, $event->getKernel());
         $this->assertSame($request, $event->getRequest());
         $this->assertSame($response, $event->getResponse());
-        $this->assertSame(KernelInterface::SUB_REQUEST, $event->getRequestType());
+        $this->assertSame(HttpKernelInterface::SUB_REQUEST, $event->getRequestType());
     }
 }