Merge branch 'release/1.1.1'

lindyhopchris · lindyhopchris · commit ce76cdc546b7 · 2022-09-14T19:43:08.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file. This project adheres to
 [Semantic Versioning](http://semver.org/) and [this changelog format](http://keepachangelog.com/).
 
+## [1.1.1] - 2022-09-14
+
+### Fixed
+
+- [laravel-json-api#204](https://github.com/laravel-json-api/laravel/issues/204) Fixed `acceptsMiddleware` functionality
+  when there is no matched route on the request.
+
 ## [1.1.0] - 2022-02-09
 
 ### Added
diff --git a/src/ExceptionParser.php b/src/ExceptionParser.php
@@ -245,9 +245,13 @@ public function acceptsJson(): self
      */
     public function acceptsMiddleware(...$middleware): self
     {
-        $this->accept[] = static fn($ex, $request): bool => Collection::make($middleware)
-            ->intersect($request->route()->gatherMiddleware())
-            ->isNotEmpty();
+        $this->accept[] = static function ($ex, $request) use ($middleware): bool {
+            $route = $request->route();
+
+            return Collection::make($middleware)
+                ->intersect($route ? $route->gatherMiddleware() : [])
+                ->isNotEmpty();
+        };
 
         return $this;
     }
diff --git a/tests/Integration/AcceptHeaderTest.php b/tests/Integration/AcceptHeaderTest.php
@@ -20,6 +20,7 @@
 namespace LaravelJsonApi\Exceptions\Tests\Integration;
 
 use Illuminate\Contracts\Debug\ExceptionHandler;
+use Illuminate\Foundation\Application;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
 use LaravelJsonApi\Exceptions\ExceptionParser;
@@ -43,7 +44,7 @@ protected function setUp(): void
         Route::middleware('api')->get('/test', function () {
             throw new HttpException(
                 418,
-                "I think I might be a teapot.",
+                'I think I might be a teapot.',
             );
         });
 
@@ -163,6 +164,48 @@ public function testAcceptsMiddlewareDoesNotMatch(): void
             ->assertSee('teapot');
     }
 
+    /**
+     * @see https://github.com/laravel-json-api/laravel/issues/204
+     */
+    public function testAcceptsMiddlewareWhenRouteNotFound(): void
+    {
+        Handler::$testRenderer = ExceptionParser::make()
+            ->acceptsMiddleware('foo', 'api')
+            ->renderable();
+
+        $response = $this->get('/blah', ['Accept' => '*/*']);
+        $response->assertStatus(404)->assertSee('Not Found');
+
+        // @TODO remove once Laravel 8 is no longer supported (8 doesn't add the header)
+        if (version_compare(Application::VERSION, '9.0.0') >= 0) {
+            $response->assertHeader('Content-Type', 'text/html; charset=UTF-8');
+        }
+    }
+
+    public function testAcceptsMiddlewareWhenRouteNotFoundWithJsonApiMediaType(): void
+    {
+        $expected = [
+            'errors' => [
+                [
+                    'title' => 'Not Found',
+                    'status' => '404',
+                ]
+            ],
+            'jsonapi' => [
+                'version' => '1.0',
+            ],
+        ];
+
+        Handler::$testRenderer = ExceptionParser::make()
+            ->acceptsMiddleware('foo', 'api')
+            ->renderable();
+
+        $this->get('/blah', ['Accept' => 'application/vnd.api+json'])
+            ->assertStatus(404)
+            ->assertHeader('Content-Type', 'application/vnd.api+json')
+            ->assertExactJson($expected);
+    }
+
     /**
      * Allow a developer to use their own callback for whether JSON:API should be rendered.
      *
diff --git a/tests/Integration/ExceptionsTest.php b/tests/Integration/ExceptionsTest.php
@@ -22,14 +22,15 @@
 use Carbon\Carbon;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Auth\AuthenticationException;
-use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Contracts\Translation\Translator;
 use Illuminate\Foundation\Http\Exceptions\MaintenanceModeException;
 use Illuminate\Session\TokenMismatchException;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\MessageBag;
 use Illuminate\Validation\ValidationException;
+use Illuminate\Validation\Validator;
 use LaravelJsonApi\Core\Exceptions\JsonApiException;
 use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
@@ -445,6 +446,9 @@ public function testValidationException(): void
 
         $validator = $this->createMock(Validator::class);
         $validator->method('errors')->willReturn($messages);
+        $validator->method('getTranslator')->willReturnCallback(
+            fn() => $this->app->make(Translator::class)
+        );
 
         $this->ex = new ValidationException($validator);
 
