Moved response conditions to middleware + Fixes #2

folkloreinc · May 29, 2017 · 5bb7085 · 5bb7085
1 parent f06fe1b
commit 5bb7085
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/src/Folklore/Hypernova/Hypernova.php b/src/Folklore/Hypernova/Hypernova.php
@@ -5,7 +5,6 @@
 use Illuminate\Container\Container;
 use Ramsey\Uuid\Uuid;
 use Folklore\Hypernova\Contracts\Renderer as RendererContract;
-use Symfony\Component\HttpFoundation\Response as BaseResponse;
 use Illuminate\Contracts\Support\Renderable;
 
 class Hypernova
@@ -117,17 +116,9 @@ public function renderComponent($name, $data = [])
 
     public function modifyResponse($response)
     {
-        if ($response instanceof BaseResponse &&
-            !$response->isRedirection() &&
-            (
-                !$response->headers->has('Content-Type') ||
-                $response->headers->has('Content-Type') === 'text/html'
-            )
-        ) {
-            $content = $response->getContent();
-            $content = $this->replaceContents($content);
-            $response->setContent($content);
-        }
+        $content = $response->getContent();
+        $content = $this->replaceContents($content);
+        $response->setContent($content);
         return $response;
     }
 

diff --git a/src/Folklore/Hypernova/HypernovaMiddleware.php b/src/Folklore/Hypernova/HypernovaMiddleware.php
@@ -3,6 +3,7 @@
 namespace Folklore\Hypernova;
 
 use Closure;
+use Symfony\Component\HttpFoundation\Response as BaseResponse;
 
 class HypernovaMiddleware
 {
@@ -18,6 +19,16 @@ public function handle($request, Closure $next, $guard = null)
     {
         $response = $next($request);
 
-        return app('hypernova')->modifyResponse($response);
+        if ($response instanceof BaseResponse &&
+            !$response->isRedirection() &&
+            (
+                !$response->headers->has('Content-Type') ||
+                strpos($response->headers->has('Content-Type'), 'text/html') !== false
+            )
+        ) {
+            return app('hypernova')->modifyResponse($response);
+        }
+
+        return $response;
     }
 }