Merge tag '1.5.4' into develop

no message
terminal42 · May 15, 2019 · 3305d3b · 3305d3b
2 parents e47d68a + 8802126
commit 3305d3b
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     "require": {
         "php": "^5.6 | ^7.0",
         "friendsofsymfony/http-cache-bundle": "^2.1",
-        "friendsofsymfony/http-cache": "^2.1",
+        "friendsofsymfony/http-cache": "^2.7",
         "symfony/options-resolver": "^3.3 | ^4.0"
     },
     "require-dev": {

diff --git a/src/DependencyInjection/HeaderReplayExtension.php b/src/DependencyInjection/HeaderReplayExtension.php
@@ -3,7 +3,7 @@
 /*
  * terminal42/header-replay-bundle for Symfony
  *
- * @copyright  Copyright (c) 2008-2018, terminal42 gmbh
+ * @copyright  Copyright (c) 2008-2019, terminal42 gmbh
  * @author     terminal42 gmbh <info@terminal42.ch>
  * @license    MIT
  * @link       http://github.com/terminal42/header-replay-bundle

diff --git a/src/Event/HeaderReplayEvent.php b/src/Event/HeaderReplayEvent.php
@@ -3,7 +3,7 @@
 /*
  * terminal42/header-replay-bundle for Symfony
  *
- * @copyright  Copyright (c) 2008-2018, terminal42 gmbh
+ * @copyright  Copyright (c) 2008-2019, terminal42 gmbh
  * @author     terminal42 gmbh <info@terminal42.ch>
  * @license    MIT
  * @link       http://github.com/terminal42/header-replay-bundle

diff --git a/src/EventListener/HeaderReplayListener.php b/src/EventListener/HeaderReplayListener.php
@@ -3,7 +3,7 @@
 /*
  * terminal42/header-replay-bundle for Symfony
  *
- * @copyright  Copyright (c) 2008-2018, terminal42 gmbh
+ * @copyright  Copyright (c) 2008-2019, terminal42 gmbh
  * @author     terminal42 gmbh <info@terminal42.ch>
  * @license    MIT
  * @link       http://github.com/terminal42/header-replay-bundle

diff --git a/src/EventListener/HeaderReplayStopPropagationListener.php b/src/EventListener/HeaderReplayStopPropagationListener.php
@@ -3,7 +3,7 @@
 /*
  * terminal42/header-replay-bundle for Symfony
  *
- * @copyright  Copyright (c) 2008-2018, terminal42 gmbh
+ * @copyright  Copyright (c) 2008-2019, terminal42 gmbh
  * @author     terminal42 gmbh <info@terminal42.ch>
  * @license    MIT
  * @link       http://github.com/terminal42/header-replay-bundle

diff --git a/src/HeaderReplayBundle.php b/src/HeaderReplayBundle.php
@@ -3,7 +3,7 @@
 /*
  * terminal42/header-replay-bundle for Symfony
  *
- * @copyright  Copyright (c) 2008-2018, terminal42 gmbh
+ * @copyright  Copyright (c) 2008-2019, terminal42 gmbh
  * @author     terminal42 gmbh <info@terminal42.ch>
  * @license    MIT
  * @link       http://github.com/terminal42/header-replay-bundle

diff --git a/src/SymfonyCache/HeaderReplaySubscriber.php b/src/SymfonyCache/HeaderReplaySubscriber.php
@@ -3,7 +3,7 @@
 /*
  * terminal42/header-replay-bundle for Symfony
  *
- * @copyright  Copyright (c) 2008-2018, terminal42 gmbh
+ * @copyright  Copyright (c) 2008-2019, terminal42 gmbh
  * @author     terminal42 gmbh <info@terminal42.ch>
  * @license    MIT
  * @link       http://github.com/terminal42/header-replay-bundle
@@ -98,7 +98,7 @@ public function preHandle(CacheEvent $event)
         // Pass the duplicated request to the original kernel (so cache is bypassed)
         // which should result in the preflight request response handled by the
         // HeaderReplayListener
-        $preflightResponse = $httpCache->getKernel()->handle($duplicate);
+        $preflightResponse = $httpCache->getKernel()->handle($duplicate, $event->getRequestType());
 
         // Early abort if the preflight response wanted to redirect for whatever
         // reason

diff --git a/tests/DependencyInjection/HeaderReplayExtensionTest.php b/tests/DependencyInjection/HeaderReplayExtensionTest.php
@@ -3,7 +3,7 @@
 /*
  * terminal42/header-replay-bundle for Symfony
  *
- * @copyright  Copyright (c) 2008-2018, terminal42 gmbh
+ * @copyright  Copyright (c) 2008-2019, terminal42 gmbh
  * @author     terminal42 gmbh <info@terminal42.ch>
  * @license    MIT
  * @link       http://github.com/terminal42/header-replay-bundle

diff --git a/tests/Event/HeaderReplayEventTest.php b/tests/Event/HeaderReplayEventTest.php
@@ -3,7 +3,7 @@
 /*
  * terminal42/header-replay-bundle for Symfony
  *
- * @copyright  Copyright (c) 2008-2018, terminal42 gmbh
+ * @copyright  Copyright (c) 2008-2019, terminal42 gmbh
  * @author     terminal42 gmbh <info@terminal42.ch>
  * @license    MIT
  * @link       http://github.com/terminal42/header-replay-bundle

diff --git a/tests/EventListener/HeaderReplayListenerTest.php b/tests/EventListener/HeaderReplayListenerTest.php
@@ -3,7 +3,7 @@
 /*
  * terminal42/header-replay-bundle for Symfony
  *
- * @copyright  Copyright (c) 2008-2018, terminal42 gmbh
+ * @copyright  Copyright (c) 2008-2019, terminal42 gmbh
  * @author     terminal42 gmbh <info@terminal42.ch>
  * @license    MIT
  * @link       http://github.com/terminal42/header-replay-bundle

diff --git a/tests/EventListener/HeaderReplayStopPropagationListenerTest.php b/tests/EventListener/HeaderReplayStopPropagationListenerTest.php
@@ -3,7 +3,7 @@
 /*
  * terminal42/header-replay-bundle for Symfony
  *
- * @copyright  Copyright (c) 2008-2018, terminal42 gmbh
+ * @copyright  Copyright (c) 2008-2019, terminal42 gmbh
  * @author     terminal42 gmbh <info@terminal42.ch>
  * @license    MIT
  * @link       http://github.com/terminal42/header-replay-bundle

diff --git a/tests/SymfonyCache/DummyHttpCacheKernel.php b/tests/SymfonyCache/DummyHttpCacheKernel.php
@@ -3,7 +3,7 @@
 /*
  * terminal42/header-replay-bundle for Symfony
  *
- * @copyright  Copyright (c) 2008-2018, terminal42 gmbh
+ * @copyright  Copyright (c) 2008-2019, terminal42 gmbh
  * @author     terminal42 gmbh <info@terminal42.ch>
  * @license    MIT
  * @link       http://github.com/terminal42/header-replay-bundle

diff --git a/tests/SymfonyCache/DummyNonHttpCacheKernel.php b/tests/SymfonyCache/DummyNonHttpCacheKernel.php
@@ -3,7 +3,7 @@
 /*
  * terminal42/header-replay-bundle for Symfony
  *
- * @copyright  Copyright (c) 2008-2018, terminal42 gmbh
+ * @copyright  Copyright (c) 2008-2019, terminal42 gmbh
  * @author     terminal42 gmbh <info@terminal42.ch>
  * @license    MIT
  * @link       http://github.com/terminal42/header-replay-bundle

diff --git a/tests/SymfonyCache/HeaderReplaySubscriberTest.php b/tests/SymfonyCache/HeaderReplaySubscriberTest.php
@@ -3,7 +3,7 @@
 /*
  * terminal42/header-replay-bundle for Symfony
  *
- * @copyright  Copyright (c) 2008-2018, terminal42 gmbh
+ * @copyright  Copyright (c) 2008-2019, terminal42 gmbh
  * @author     terminal42 gmbh <info@terminal42.ch>
  * @license    MIT
  * @link       http://github.com/terminal42/header-replay-bundle
@@ -146,10 +146,13 @@ public function testKernelIsCorrectlyCalledWithPreflightAcceptHeader()
         $kernel
             ->expects($this->once())
             ->method('handle')
-            ->with($this->callback(function (Request $request) {
-                return 'HEAD' === $request->getMethod() &&
-                    HeaderReplayListener::CONTENT_TYPE === $request->headers->get('Accept');
-            }))
+            ->with(
+                $this->callback(function (Request $request) {
+                    return 'HEAD' === $request->getMethod() &&
+                        HeaderReplayListener::CONTENT_TYPE === $request->headers->get('Accept');
+                }),
+                $this->equalTo(HttpKernelInterface::MASTER_REQUEST)
+            )
             ->willReturn($response);
 
         $httpCache = $this->getHttpCacheKernelWithGivenKernel($kernel);
@@ -166,6 +169,38 @@ public function testKernelIsCorrectlyCalledWithPreflightAcceptHeader()
         $subscriber->preHandle($cacheEvent);
     }
 
+    public function testKernelIsCorrectlyCalledWithRequestType()
+    {
+        $response = new Response();
+        $kernel = $this->createMock(HttpCache::class);
+        $kernel
+            ->expects($this->once())
+            ->method('handle')
+            ->with(
+                $this->callback(function (Request $request) {
+                    return 'HEAD' === $request->getMethod() &&
+                        HeaderReplayListener::CONTENT_TYPE === $request->headers->get('Accept');
+                }),
+                $this->equalTo(HttpKernelInterface::SUB_REQUEST)
+            )
+            ->willReturn($response);
+
+        $httpCache = $this->getHttpCacheKernelWithGivenKernel($kernel);
+
+        $request = Request::create('/foobar', 'GET');
+        $request->cookies->set('Foo', 'Bar');
+
+        $cacheEvent = new CacheEvent(
+            $httpCache,
+            $request,
+            null,
+            HttpKernelInterface::SUB_REQUEST
+        );
+
+        $subscriber = new HeaderReplaySubscriber();
+        $subscriber->preHandle($cacheEvent);
+    }
+
     public function testEarlyAbortIfRedirectionOnPreflightResponse()
     {
         $response = new RedirectResponse('https://foobar.com');