refactor: fix HTTP request handler

Author: butschster

src/Transports/HttpServer.php

@@ -109,7 +109,9 @@ public function listen(callable $onRequest, callable $onClose): void
 
     public function onTick(\Closure $onTick): void
     {
-        $this->loop->futureTick($onTick($this));
+        $this->loop->futureTick(function () use ($onTick): void {
+            $onTick($this);
+        });
     }
 
     public function isClosing(): bool

src/Transports/HttpServerTransport.php

@@ -13,6 +13,7 @@
 use PhpMcp\Schema\JsonRpc\Error;
 use PhpMcp\Schema\JsonRpc\Message;
 use PhpMcp\Schema\JsonRpc\Parser;
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
@@ -126,24 +127,22 @@ public function emit($event, array $arguments = [])
         return $this->httpServer->emit($event, $arguments);
     }
 
-    private function createRequestHandler(): callable
+    private function createRequestHandler(ServerRequestInterface $request): ResponseInterface
     {
-        return function (ServerRequestInterface $request) {
-            $path = $request->getUri()->getPath();
-            $method = $request->getMethod();
+        $path = $request->getUri()->getPath();
+        $method = $request->getMethod();
 
-            if ($method === 'GET' && $path === $this->ssePath) {
-                return $this->handleSseRequest($request);
-            }
+        if ($method === 'GET' && $path === $this->ssePath) {
+            return $this->handleSseRequest($request);
+        }
 
-            if ($method === 'POST' && $path === $this->messagePath) {
-                return $this->handleMessagePostRequest($request);
-            }
+        if ($method === 'POST' && $path === $this->messagePath) {
+            return $this->handleMessagePostRequest($request);
+        }
 
-            $this->logger->debug('404 Not Found', ['method' => $method, 'path' => $path]);
+        $this->logger->debug('404 Not Found', ['method' => $method, 'path' => $path]);
 
-            return new Response(404, ['Content-Type' => 'text/plain'], 'Not Found');
-        };
+        return new Response(404, ['Content-Type' => 'text/plain'], 'Not Found');
     }
 
     /**

src/Transports/StreamableHttpServerTransport.php

@@ -19,6 +19,7 @@
 use PhpMcp\Schema\JsonRpc\Parser;
 use PhpMcp\Schema\JsonRpc\Request;
 use PhpMcp\Schema\JsonRpc\Response;
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
@@ -248,28 +249,26 @@ public function emit($event, array $arguments = [])
         return $this->httpServer->emit($event, $arguments);
     }
 
-    private function createRequestHandler(): callable
+    private function createRequestHandler(ServerRequestInterface $request): ResponseInterface
     {
-        return function (ServerRequestInterface $request) {
-            $path = $request->getUri()->getPath();
-            $method = $request->getMethod();
+        $path = $request->getUri()->getPath();
+        $method = $request->getMethod();
 
-            if ($path !== $this->httpServer->mcpPath()) {
-                $error = Error::forInvalidRequest("Not found: {$path}");
-                return new HttpResponse(404, ['Content-Type' => 'application/json'], \json_encode($error));
-            }
+        if ($path !== $this->httpServer->mcpPath()) {
+            $error = Error::forInvalidRequest("Not found: {$path}");
+            return new HttpResponse(404, ['Content-Type' => 'application/json'], \json_encode($error));
+        }
 
-            try {
-                return match ($method) {
-                    'GET' => $this->handleGetRequest($request),
-                    'POST' => $this->handlePostRequest($request),
-                    'DELETE' => $this->handleDeleteRequest($request),
-                    default => $this->handleUnsupportedRequest($request),
-                };
-            } catch (\Throwable $e) {
-                return $this->handleRequestError($e, $request);
-            }
-        };
+        try {
+            return match ($method) {
+                'GET' => $this->handleGetRequest($request),
+                'POST' => $this->handlePostRequest($request),
+                'DELETE' => $this->handleDeleteRequest($request),
+                default => $this->handleUnsupportedRequest($request),
+            };
+        } catch (\Throwable $e) {
+            return $this->handleRequestError($e, $request);
+        }
     }
 
     private function handleGetRequest(ServerRequestInterface $request): PromiseInterface