From 92746924159e9667429d0fa5ee8c7d5ed34ea514 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Thu, 14 Jun 2018 11:46:47 +1200
Subject: [PATCH] Fix core tests

---
 src/Control/Middleware/ChangeDetectionMiddleware.php  | 3 +++
 src/Control/Middleware/HTTPCacheControlMiddleware.php | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/Control/Middleware/ChangeDetectionMiddleware.php b/src/Control/Middleware/ChangeDetectionMiddleware.php
index 833483134..4980a95b7 100644
--- a/src/Control/Middleware/ChangeDetectionMiddleware.php
+++ b/src/Control/Middleware/ChangeDetectionMiddleware.php
@@ -25,6 +25,9 @@ class ChangeDetectionMiddleware implements HTTPMiddleware
     {
         /** @var HTTPResponse $response */
         $response = $delegate($request);
+        if (!$response) {
+            return null;
+        }
 
         // Ignore etag for no-store
         $cacheControl = $response->getHeader('Cache-Control');
diff --git a/src/Control/Middleware/HTTPCacheControlMiddleware.php b/src/Control/Middleware/HTTPCacheControlMiddleware.php
index c91d9c641..7aaae088a 100644
--- a/src/Control/Middleware/HTTPCacheControlMiddleware.php
+++ b/src/Control/Middleware/HTTPCacheControlMiddleware.php
@@ -43,6 +43,9 @@ class HTTPCacheControlMiddleware implements HTTPMiddleware, Resettable
         } catch (HTTPResponse_Exception $ex) {
             $response = $ex->getResponse();
         }
+        if (!$response) {
+            return null;
+        }
 
         // Update state based on current request and response objects
         $this->augmentState($request, $response);