From 7ffbc9f78359fc6b5cfbc3fb60c272f7e745ac75 Mon Sep 17 00:00:00 2001
From: Ashley Hindle <ashley.hindle@laravel.com>
Date: Thu, 23 Oct 2025 09:21:55 +0100
Subject: [PATCH] refactor: move to first class callable

Matches rector 2.2.4
---
 composer.json                                          | 2 +-
 rector.php                                             | 1 -
 src/Server.php                                         | 2 +-
 src/Server/Middleware/ReorderJsonAccept.php            | 2 +-
 src/Server/Tool.php                                    | 2 +-
 tests/Unit/Server/Middleware/ReorderJsonAcceptTest.php | 4 ++--
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 29c9cf5..d570a1a 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
         "orchestra/testbench": "^8.36.0|^9.15.0|^10.6.0",
         "pestphp/pest": "^2.36.0|^3.8.4|^4.1.0",
         "phpstan/phpstan": "^2.1.27",
-        "rector/rector": "^2.1.7"
+        "rector/rector": "^2.2.4"
     },
     "autoload": {
         "psr-4": {
diff --git a/rector.php b/rector.php
index f5efda8..a8fd22a 100644
--- a/rector.php
+++ b/rector.php
@@ -21,5 +21,4 @@
         codingStyle: true,
         typeDeclarations: true,
         earlyReturn: true,
-        strictBooleans: true,
     )->withPhpSets(php81: true);
diff --git a/src/Server.php b/src/Server.php
index a6012db..eedc951 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -144,7 +144,7 @@ public function start(): void
     {
         $this->boot();
 
-        $this->transport->onReceive(fn (string $message) => $this->handle($message));
+        $this->transport->onReceive($this->handle(...));
     }
 
     protected function boot(): void
diff --git a/src/Server/Middleware/ReorderJsonAccept.php b/src/Server/Middleware/ReorderJsonAccept.php
index 3c3f90e..1e95dc6 100644
--- a/src/Server/Middleware/ReorderJsonAccept.php
+++ b/src/Server/Middleware/ReorderJsonAccept.php
@@ -19,7 +19,7 @@ public function handle(Request $request, Closure $next): Response
     {
         $accept = $request->header('Accept');
         if (is_string($accept) && str_contains($accept, ',')) {
-            $accept = array_map('trim', explode(',', $accept));
+            $accept = array_map(trim(...), explode(',', $accept));
         }
 
         if (! is_array($accept)) {
diff --git a/src/Server/Tool.php b/src/Server/Tool.php
index 593cff7..110411a 100644
--- a/src/Server/Tool.php
+++ b/src/Server/Tool.php
@@ -63,7 +63,7 @@ public function toArray(): array
             'title' => $this->title(),
             'description' => $this->description(),
             'inputSchema' => JsonSchema::object(
-                fn (JsonSchema $schema): array => $this->schema($schema),
+                $this->schema(...),
             )->toArray(),
             'annotations' => $annotations === [] ? (object) [] : $annotations,
         ];
diff --git a/tests/Unit/Server/Middleware/ReorderJsonAcceptTest.php b/tests/Unit/Server/Middleware/ReorderJsonAcceptTest.php
index ab51a61..d6df967 100644
--- a/tests/Unit/Server/Middleware/ReorderJsonAcceptTest.php
+++ b/tests/Unit/Server/Middleware/ReorderJsonAcceptTest.php
@@ -56,7 +56,7 @@
     $middleware->handle($request, fn ($req): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response => response('test'));
 
     $accept = $request->header('Accept');
-    $parts = array_map('trim', explode(',', $accept));
+    $parts = array_map(trim(...), explode(',', $accept));
 
     expect($parts)->toMatchArray(['application/json', 'text/html', 'application/vnd.api+json', 'text/plain'])
         ->and(count($parts))->toBe(4);
@@ -71,7 +71,7 @@
     $middleware->handle($request, fn ($req): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response => response('test'));
 
     $accept = $request->header('Accept');
-    $parts = array_map('trim', explode(',', $accept));
+    $parts = array_map(trim(...), explode(',', $accept));
 
     expect($parts[0])->toBe('application/json;q=0.8');
 });