Merge branch 'master' into feature/seperateCacheHeaderAndCaching

# Conflicts:
#	Classes/Http/RequestInterceptorComponent.php

Author: mficzel

Classes/Http/RequestInterceptorComponent.php

@@ -66,7 +66,11 @@ public function handle(ComponentContext $componentContext)
 
         $entry = $this->cacheFrontend->get($entryIdentifier);
         if ($entry) {
-            $cachedResponse = parse_response($entry);
+            if (class_exists('Neos\\Flow\\Http\\Response')) {
+                $cachedResponse = \Neos\Flow\Http\Response::createFromRaw($entry);
+            } else {
+                $cachedResponse = parse_response($entry);
+            }
 
             $etag = $cachedResponse->getHeaderLine('ETag');
             $lifetime = (int)$cachedResponse->getHeaderLine('X-Storage-Lifetime');
@@ -79,7 +83,12 @@ public function handle(ComponentContext $componentContext)
 
             $ifNoneMatch = $request->getHeaderLine('If-None-Match');
             if ($ifNoneMatch &&  $ifNoneMatch === $etag ) {
-                $response = (new Response( 304))
+                if (class_exists('Neos\\Flow\\Http\\Response')) {
+                    $response = new \Neos\Flow\Http\Response();
+                } else {
+                    $response = new Response(304);
+                }
+                $response = $response
                     ->withHeader('CacheControl', 'max-age=' . ($lifetime - $age))
                     ->withHeader('X-From-FullPageCache', $entryIdentifier);
             } else {

Classes/Http/RequestStorageComponent.php

@@ -61,7 +61,12 @@ public function handle(ComponentContext $componentContext)
 
                 $ifNoneMatch = $request->getHeaderLine('If-None-Match');
                 if ($ifNoneMatch &&  $ifNoneMatch === $etag ) {
-                    $notModifiedResponse = (new Response(304))
+                    if (class_exists('Neos\\Flow\\Http\\Response')) {
+                        $notModifiedResponse = new \Neos\Flow\Http\Response();
+                    } else {
+                        $notModifiedResponse = new Response(304);
+                    }
+                    $notModifiedResponse = $notModifiedResponse
                         ->withAddedHeader('CacheControl', 'max-age=' . $lifetime)
                         ->withHeader('X-From-FullPageCache', $entryIdentifier);
                     $componentContext->replaceHttpResponse($notModifiedResponse);

composer.json

@@ -4,7 +4,7 @@
     "name": "flowpack/fullpagecache",
     "license": "MIT",
     "require": {
-        "neos/neos": "^5.0 || dev-master"
+        "neos/neos": "~4.3.6 || ^5.0 || dev-master"
     },
     "autoload": {
         "psr-4": {