Fixed middleware initialization

Author: Andrey Helldar

src/Middlewares/SetHeaderMiddleware.php

@@ -5,7 +5,6 @@
 use Closure;
 use Illuminate\Http\Request;
 use Lmc\HttpConstants\Header;
-use Symfony\Component\HttpFoundation\JsonResponse;
 
 class SetHeaderMiddleware
 {
@@ -17,14 +16,20 @@ class SetHeaderMiddleware
      */
     public function handle(Request $request, Closure $next)
     {
-        /** @var \Illuminate\Http\Response $response */
         $response = $next($request);
 
-        return $this->hasJson($response) ? $response : $response->header(Header::ACCEPT, 'application/json');
+        $this->set($response);
+
+        return $response;
     }
 
-    protected function hasJson($response): bool
+    /**
+     * @param \Illuminate\Http\JsonResponse|\Illuminate\Http\Response $response
+     *
+     * @return void
+     */
+    protected function set($response)
     {
-        return $response instanceof JsonResponse;
+        $response->headers->set(Header::ACCEPT, 'application/json');
     }
 }

src/ServiceProvider.php

@@ -13,7 +13,6 @@ class ServiceProvider extends BaseServiceProvider
     public function boot(): void
     {
         $this->resolve()->prependMiddleware($this->middleware);
-        $this->resolve()->prependToMiddlewarePriority($this->middleware);
     }
 
     protected function resolve(): Kernel

tests/Middlewares/DuplicateTest.php

@@ -14,7 +14,7 @@ public function testWeb(): void
             ->assertSuccessful()
             ->assertHeader(Header::ACCEPT, 'application/json')
             ->assertJsonStructure(['data'])
-            ->assertJson(['data' => 'Hello, JSON!']);
+            ->assertJson(['data' => 'Hello, Web!']);
     }
 
     public function testApi(): void
@@ -24,6 +24,16 @@ public function testApi(): void
             ->assertSuccessful()
             ->assertHeader(Header::ACCEPT, 'application/json')
             ->assertJsonStructure(['data'])
-            ->assertJson(['data' => 'Hello, JSON!']);
+            ->assertJson(['data' => 'Hello, Api!']);
+    }
+
+    public function testCustom(): void
+    {
+        $this
+            ->get('custom')
+            ->assertSuccessful()
+            ->assertHeader(Header::ACCEPT, 'application/json')
+            ->assertJsonStructure(['data'])
+            ->assertJson(['data' => 'Hello, Custom!']);
     }
 }

tests/Middlewares/SetHeaderMiddlewareTest.php

@@ -3,7 +3,6 @@
 namespace Tests;
 
 use DragonCode\LaravelJsonResponse\ServiceProvider;
-use Illuminate\Contracts\Http\Kernel;
 use Orchestra\Testbench\TestCase as BaseTestCase;
 
 abstract class TestCase extends BaseTestCase
@@ -20,17 +19,19 @@ protected function getEnvironmentSetUp($app)
 
     protected function setRoutes($app): void
     {
-        $app['router']->get('web', function () {
-            return ['data' => 'Hello, JSON!'];
+        /** @var \Illuminate\Routing\RouteRegistrar $router */
+        $router = $app['router'];
+
+        $router->get('web', function () {
+            return ['data' => 'Hello, Web!'];
         })->middleware('web');
 
-        $app['router']->get('api', function () {
-            return ['data' => 'Hello, JSON!'];
+        $router->get('api', function () {
+            return ['data' => 'Hello, Api!'];
         })->middleware('api');
-    }
 
-    protected function getMiddlewareGroups(): array
-    {
-        return $this->app->make(Kernel::class)->getMiddlewareGroups();
+        $router->get('custom', function () {
+            return ['data' => 'Hello, Custom!'];
+        });
     }
 }