Provide Symfony HttpCache as trait

Author: ddeboer

src/SymfonyCache/EventDispatchingHttpCache.php

@@ -11,16 +11,15 @@
 
 namespace FOS\HttpCache\SymfonyCache;
 
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\HttpCache\HttpCache;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
- * Base class for enhanced Symfony reverse proxy based on the symfony component.
+ * Trait for enhanced Symfony reverse proxy based on the symfony component.
  *
  * <b>When using FOSHttpCacheBundle, look at FOS\HttpCacheBundle\HttpCache instead.</b>
  *
@@ -31,7 +30,7 @@
  *
  * {@inheritdoc}
  */
-abstract class EventDispatchingHttpCache extends HttpCache implements CacheInvalidationInterface
+trait EventDispatchingHttpCache
 {
     /**
      * @var EventDispatcherInterface

tests/Functional/Fixtures/Symfony/AppCache.php

@@ -2,12 +2,16 @@
 
 namespace FOS\HttpCache\Tests\Functional\Fixtures\Symfony;
 
+use FOS\HttpCache\SymfonyCache\CacheInvalidationInterface;
 use FOS\HttpCache\SymfonyCache\EventDispatchingHttpCache;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpCache\HttpCache;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
-class AppCache extends EventDispatchingHttpCache
+class AppCache extends HttpCache implements CacheInvalidationInterface
 {
+    use EventDispatchingHttpCache;
+
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
     {
         $response = parent::handle($request, $type, $catch);
@@ -25,4 +29,14 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
 
         return $response;
     }
+
+    /**
+     * Made public to allow event subscribers to do refresh operations.
+     *
+     * {@inheritDoc}
+     */
+    public function fetch(Request $request, $catch = false)
+    {
+        return parent::fetch($request, $catch);
+    }
 }

tests/Unit/SymfonyCache/EventDispatchingHttpCacheTest.php

@@ -11,12 +11,14 @@
 
 namespace FOS\HttpCache\Tests\Unit\SymfonyCache;
 
+use FOS\HttpCache\SymfonyCache\CacheInvalidationInterface;
 use FOS\HttpCache\SymfonyCache\EventDispatchingHttpCache;
 use FOS\HttpCache\SymfonyCache\CacheEvent;
 use FOS\HttpCache\SymfonyCache\Events;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpCache\HttpCache;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 class EventDispatchingHttpCacheTest extends \PHPUnit_Framework_TestCase
@@ -27,7 +29,7 @@ class EventDispatchingHttpCacheTest extends \PHPUnit_Framework_TestCase
     protected function getHttpCachePartialMock(array $mockedMethods = null)
     {
         $mock = $this
-            ->getMockBuilder('\FOS\HttpCache\SymfonyCache\EventDispatchingHttpCache')
+            ->getMockBuilder('\FOS\HttpCache\Tests\Unit\SymfonyCache\AppCache')
             ->setMethods( $mockedMethods )
             ->disableOriginalConstructor()
             ->getMock()
@@ -142,6 +144,16 @@ public function testAbortInvalidate()
     }
 }
 
+class AppCache extends HttpCache implements CacheInvalidationInterface
+{
+    use EventDispatchingHttpCache;
+
+    public function fetch(Request $request, $catch = false)
+    {
+        return $this->fetch($request, $catch);
+    }
+}
+
 class TestSubscriber implements EventSubscriberInterface
 {
     public $handleHits = 0;