feat: improve static analysis

Author: ashleyhindle

src/Console/Commands/InspectorCommand.php

@@ -36,7 +36,7 @@ public function handle(Registrar $registrar): int
         $route = $registrar->getWebServer($handle);
 
         $servers = $registrar->servers();
-        if (empty($servers)) {
+        if ($servers === []) {
             $this->components->error('No MCP servers found. Please run `php artisan make:mcp-server [name]`');
 
             return static::FAILURE;
@@ -47,7 +47,7 @@ public function handle(Registrar $registrar): int
             $server = array_shift($servers);
             [$localServer, $route] = match (true) {
                 is_callable($server) => [$server, null],
-                get_class($server) === Route::class => [null, $server],
+                $server::class === Route::class => [null, $server],
                 default => [null, null],
             };
         }

src/Server/Middleware/ReorderJsonAccept.php

@@ -26,7 +26,7 @@ public function handle(Request $request, Closure $next): Response
             return $next($request);
         }
 
-        usort($accept, fn ($a, $b) => str_contains($b, 'application/json') <=> str_contains($a, 'application/json'));
+        usort($accept, fn ($a, $b): int => str_contains((string) $b, 'application/json') <=> str_contains((string) $a, 'application/json'));
         $request->headers->set('Accept', implode(', ', $accept));
 
         return $next($request);

src/Server/Registrar.php

@@ -30,7 +30,7 @@ class Registrar
     public function web(string $route, string $serverClass): Route
     {
         // https://modelcontextprotocol.io/specification/2025-06-18/basic/transports#listening-for-messages-from-the-server
-        Router::get($route, fn () => response(status: 405));
+        Router::get($route, fn (): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response => response(status: 405));
 
         $route = Router::post($route, fn (): mixed => $this->startServer(
             $serverClass,

src/Server/Transport/HttpTransport.php

@@ -52,7 +52,7 @@ public function run(): Response|StreamedResponse
         }
 
         // Must be 202 - https://modelcontextprotocol.io/specification/2025-06-18/basic/transports#sending-messages-to-the-server
-        $statusCode = empty($this->reply) ? 202 : 200;
+        $statusCode = $this->reply === null || $this->reply === '' || $this->reply === '0' ? 202 : 200;
         $response = response($this->reply, $statusCode, $this->getHeaders());
 
         assert($response instanceof Response);

tests/Feature/Console/StartCommandTest.php

@@ -169,21 +169,19 @@
     expect($response->json())->toEqual(expectedListToolsResponse());
 });
 
-it('returns 405 for GET requests to MCP web routes', function () {
+it('returns 405 for GET requests to MCP web routes', function (): void {
     $response = $this->get('test-mcp');
 
     $response->assertStatus(405);
     $response->assertSee('');
 });
 
-it('returns OAuth WWW-Authenticate header when OAuth routes are enabled and response is 401', function () {
+it('returns OAuth WWW-Authenticate header when OAuth routes are enabled and response is 401', function (): void {
     // Enable OAuth routes which registers the 'mcp.oauth.protected-resource' route
-    app('Laravel\Mcp\Server\Registrar')->oauthRoutes();
+    app(\Laravel\Mcp\Server\Registrar::class)->oauthRoutes();
 
     // Create a test route that returns 401 to trigger the middleware
-    Route::post('test-oauth-401', function () {
-        return response()->json(['error' => 'unauthorized'], 401);
-    })->middleware(['Laravel\Mcp\Server\Middleware\AddWwwAuthenticateHeader']);
+    Route::post('test-oauth-401', fn() => response()->json(['error' => 'unauthorized'], 401))->middleware([\Laravel\Mcp\Server\Middleware\AddWwwAuthenticateHeader::class]);
 
     $response = $this->postJson('test-oauth-401', []);
 
@@ -195,11 +193,9 @@
     expect($wwwAuth)->toContain('resource_metadata="'.url('/.well-known/oauth-protected-resource').'"');
 });
 
-it('returns Sanctum WWW-Authenticate header when OAuth routes are not enabled and response is 401', function () {
+it('returns Sanctum WWW-Authenticate header when OAuth routes are not enabled and response is 401', function (): void {
     // Create a test route that returns 401 to trigger the middleware
-    Route::post('test-sanctum-401', function () {
-        return response()->json(['error' => 'unauthorized'], 401);
-    })->middleware(['Laravel\Mcp\Server\Middleware\AddWwwAuthenticateHeader']);
+    Route::post('test-sanctum-401', fn() => response()->json(['error' => 'unauthorized'], 401))->middleware([\Laravel\Mcp\Server\Middleware\AddWwwAuthenticateHeader::class]);
 
     $response = $this->postJson('test-sanctum-401', []);
 
@@ -210,8 +206,8 @@
     expect($wwwAuth)->toBe('Bearer realm="mcp", error="invalid_token"');
 });
 
-it('does not add WWW-Authenticate header when response is not 401', function () {
-    app('Laravel\Mcp\Server\Registrar')->oauthRoutes();
+it('does not add WWW-Authenticate header when response is not 401', function (): void {
+    app(\Laravel\Mcp\Server\Registrar::class)->oauthRoutes();
 
     $response = $this->postJson('test-mcp', initializeMessage());
 

tests/Unit/Server/Middleware/ReorderJsonAcceptTest.php

@@ -3,57 +3,57 @@
 use Illuminate\Http\Request;
 use Laravel\Mcp\Server\Middleware\ReorderJsonAccept;
 
-it('leaves single accept header unchanged', function () {
+it('leaves single accept header unchanged', function (): void {
     $request = new Request;
     $request->headers->set('Accept', 'application/json');
 
     $middleware = new ReorderJsonAccept;
 
-    $middleware->handle($request, fn ($req) => response('test'));
+    $middleware->handle($request, fn ($req): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response => response('test'));
 
     expect($request->header('Accept'))->toBe('application/json');
 });
 
-it('leaves non-comma separated accept header unchanged', function () {
+it('leaves non-comma separated accept header unchanged', function (): void {
     $request = new Request;
     $request->headers->set('Accept', 'text/html');
 
     $middleware = new ReorderJsonAccept;
 
-    $middleware->handle($request, fn ($req) => response('test'));
+    $middleware->handle($request, fn ($req): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response => response('test'));
 
     expect($request->header('Accept'))->toBe('text/html');
 });
 
-it('reorders multiple accept headers to prioritize json', function () {
+it('reorders multiple accept headers to prioritize json', function (): void {
     $request = new Request;
     $request->headers->set('Accept', 'text/html, application/json, text/plain');
 
     $middleware = new ReorderJsonAccept;
 
-    $middleware->handle($request, fn ($req) => response('test'));
+    $middleware->handle($request, fn ($req): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response => response('test'));
 
     expect($request->header('Accept'))->toBe('application/json, text/html, text/plain');
 });
 
-it('handles json already first in list', function () {
+it('handles json already first in list', function (): void {
     $request = new Request;
     $request->headers->set('Accept', 'application/json, text/html, text/plain');
 
     $middleware = new ReorderJsonAccept;
 
-    $middleware->handle($request, fn ($req) => response('test'));
+    $middleware->handle($request, fn ($req): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response => response('test'));
 
     expect($request->header('Accept'))->toBe('application/json, text/html, text/plain');
 });
 
-it('handles multiple json types correctly', function () {
+it('handles multiple json types correctly', function (): void {
     $request = new Request;
     $request->headers->set('Accept', 'text/html, application/json, application/vnd.api+json, text/plain');
 
     $middleware = new ReorderJsonAccept;
 
-    $middleware->handle($request, fn ($req) => response('test'));
+    $middleware->handle($request, fn ($req): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response => response('test'));
 
     $accept = $request->header('Accept');
     $parts = array_map('trim', explode(',', $accept));
@@ -62,70 +62,70 @@
         ->and(count($parts))->toBe(4);
 });
 
-it('handles accept header with quality values', function () {
+it('handles accept header with quality values', function (): void {
     $request = new Request;
     $request->headers->set('Accept', 'text/html;q=0.9, application/json;q=0.8, text/plain;q=0.7');
 
     $middleware = new ReorderJsonAccept;
 
-    $middleware->handle($request, fn ($req) => response('test'));
+    $middleware->handle($request, fn ($req): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response => response('test'));
 
     $accept = $request->header('Accept');
     $parts = array_map('trim', explode(',', $accept));
 
     expect($parts[0])->toBe('application/json;q=0.8');
 });
 
-it('handles whitespace in accept header', function () {
+it('handles whitespace in accept header', function (): void {
     $request = new Request;
     $request->headers->set('Accept', '  text/html  ,  application/json  ,  text/plain  ');
 
     $middleware = new ReorderJsonAccept;
 
-    $middleware->handle($request, fn ($req) => response('test'));
+    $middleware->handle($request, fn ($req): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response => response('test'));
 
     expect($request->header('Accept'))->toBe('application/json, text/html, text/plain');
 });
 
-it('handles no json in accept header', function () {
+it('handles no json in accept header', function (): void {
     $request = new Request;
     $request->headers->set('Accept', 'text/html, text/plain, image/png');
 
     $middleware = new ReorderJsonAccept;
 
-    $middleware->handle($request, fn ($req) => response('test'));
+    $middleware->handle($request, fn ($req): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response => response('test'));
 
     expect($request->header('Accept'))->toBe('text/html, text/plain, image/png');
 });
 
-it('handles empty accept header', function () {
+it('handles empty accept header', function (): void {
     $request = new Request;
     $request->headers->set('Accept', '');
 
     $middleware = new ReorderJsonAccept;
 
-    $middleware->handle($request, fn ($req) => response('test'));
+    $middleware->handle($request, fn ($req): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response => response('test'));
 
     expect($request->header('Accept'))->toBe('');
 });
 
-it('handles missing accept header', function () {
+it('handles missing accept header', function (): void {
     $request = new Request;
 
     $middleware = new ReorderJsonAccept;
 
-    $response = $middleware->handle($request, fn ($req) => response('test'));
+    $response = $middleware->handle($request, fn ($req): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response => response('test'));
 
     expect($response->getContent())->toBe('test');
 });
 
-it('passes request through middleware correctly', function () {
+it('passes request through middleware correctly', function (): void {
     $request = new Request;
     $request->headers->set('Accept', 'text/html, application/json');
 
     $middleware = new ReorderJsonAccept;
 
-    $response = $middleware->handle($request, function ($req) {
+    $response = $middleware->handle($request, function ($req): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response {
         expect($req->header('Accept'))->toBe('application/json, text/html');
 
         return response('middleware worked');