Merge pull request #21 from markstory/45-fixes

Improve compatibility with CakePHP 4.5 and PHP 8.2
ishanvyas22 · Jul 26, 2023 · ca58a35 · ca58a35
2 parents 647fb84 + 741e36a
commit ca58a35
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Middleware/InertiaMiddleware.php b/src/Middleware/InertiaMiddleware.php
@@ -21,12 +21,12 @@ class InertiaMiddleware implements MiddlewareInterface
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        if (!$request->hasHeader('X-Inertia')) {
-            return $handler->handle($request);
-        }
         if ($request instanceof ServerRequest) {
             $this->setupDetectors($request);
         }
+        if (!$request->hasHeader('X-Inertia')) {
+            return $handler->handle($request);
+        }
 
         $response = $handler->handle($request);
         if (

diff --git a/tests/TestCase/View/InertiaJsonViewTest.php b/tests/TestCase/View/InertiaJsonViewTest.php
@@ -10,6 +10,8 @@
 
 class InertiaJsonViewTest extends TestCase
 {
+    public $View;
+
     public function setUp(): void
     {
         parent::setUp();