refactor: rename RequestHandler to Dispatcher for better semantic clarity

Author: CodeWithKyrian

examples/02-discovery-http-userprofile/server.php

@@ -71,8 +71,8 @@ public function log($level, \Stringable|string $message, array $context = []): v
 
     $server->discover(__DIR__, ['.']);
 
-    $transport = new HttpServerTransport('127.0.0.1', 8080, 'mcp');
-    // $transport = new StreamableHttpServerTransport('127.0.0.1', 8080, 'mcp');
+    // $transport = new HttpServerTransport('127.0.0.1', 8080, 'mcp');
+    $transport = new StreamableHttpServerTransport('127.0.0.1', 8080, 'mcp');
 
     $server->listen($transport);
 

src/Attributes/McpResource.php

@@ -27,5 +27,6 @@ public function __construct(
         public ?string $mimeType = null,
         public ?int $size = null,
         public ?Annotations $annotations = null,
-    ) {}
+    ) {
+    }
 }

src/Attributes/McpResourceTemplate.php

@@ -25,5 +25,6 @@ public function __construct(
         public ?string $description = null,
         public ?string $mimeType = null,
         public ?Annotations $annotations = null,
-    ) {}
+    ) {
+    }
 }

src/Attributes/McpTool.php

@@ -17,5 +17,6 @@ public function __construct(
         public ?string $name = null,
         public ?string $description = null,
         public ?ToolAnnotations $annotations = null,
-    ) {}
+    ) {
+    }
 }

src/Configuration.php

@@ -37,5 +37,6 @@ public function __construct(
         public readonly ContainerInterface $container,
         public readonly int $definitionCacheTtl = 3600,
         public readonly int $paginationLimit = 50,
-    ) {}
+    ) {
+    }
 }

src/Support/RequestHandler.php renamed to src/Dispatcher.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpMcp\Server\Support;
+namespace PhpMcp\Server;
 
 use JsonException;
 use PhpMcp\Schema\JsonRpc\Request;
@@ -39,12 +39,13 @@
 use PhpMcp\Server\Protocol;
 use PhpMcp\Server\Registry;
 use PhpMcp\Server\Session\SubscriptionManager;
+use PhpMcp\Server\Support\SchemaValidator;
 use PhpMcp\Server\Traits\ResponseFormatter;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 use Throwable;
 
-class RequestHandler
+class Dispatcher
 {
     use ResponseFormatter;
 
@@ -159,7 +160,7 @@ public function handleToolCall(CallToolRequest $request): CallToolResult
         $toolName = $request->name;
         $arguments = $request->arguments;
 
-        ['tool' => $tool, 'invoker' => $invoker] = $this->registry->getTool($toolName);
+        ['tool' => $tool, 'handler' => $handler] = $this->registry->getTool($toolName);
         if (! $tool) {
             throw McpServerException::methodNotFound("Tool '{$toolName}' not found.");
         }
@@ -187,7 +188,7 @@ public function handleToolCall(CallToolRequest $request): CallToolResult
         }
 
         try {
-            $result = $invoker->invoke($this->container, $arguments);
+            $result = $handler->handle($this->container, $arguments);
             $formattedResult = $this->formatToolResult($result);
 
             return new CallToolResult($formattedResult, false);
@@ -230,15 +231,15 @@ public function handleResourceRead(ReadResourceRequest $request): ReadResourceRe
     {
         $uri = $request->uri;
 
-        ['resource' => $resource, 'invoker' => $invoker, 'variables' => $uriVariables] = $this->registry->getResource($uri);
+        ['resource' => $resource, 'handler' => $handler, 'variables' => $uriVariables] = $this->registry->getResource($uri);
 
         if (! $resource) {
             throw McpServerException::invalidParams("Resource URI '{$uri}' not found.");
         }
 
         try {
             $arguments = array_merge($uriVariables, ['uri' => $uri]);
-            $result = $invoker->invoke($this->container, $arguments);
+            $result = $handler->handle($this->container, $arguments);
             $contents = $this->formatResourceContents($result, $uri, $resource->mimeType);
 
             return new ReadResourceResult($contents);
@@ -281,7 +282,7 @@ public function handlePromptGet(GetPromptRequest $request): GetPromptResult
         $promptName = $request->name;
         $arguments = $request->arguments;
 
-        ['prompt' => $prompt, 'invoker' => $invoker] = $this->registry->getPrompt($promptName);
+        ['prompt' => $prompt, 'handler' => $handler] = $this->registry->getPrompt($promptName);
         if (! $prompt) {
             throw McpServerException::invalidParams("Prompt '{$promptName}' not found.");
         }
@@ -295,7 +296,7 @@ public function handlePromptGet(GetPromptRequest $request): GetPromptResult
         }
 
         try {
-            $result = $invoker->invoke($this->container, $arguments);
+            $result = $handler->handle($this->container, $arguments);
             $messages = $this->formatPromptMessages($result);
 
             return new GetPromptResult($messages, $prompt->description);

src/Protocol.php

@@ -51,12 +51,12 @@ public function __construct(
         protected Configuration $configuration,
         protected Registry $registry,
         protected SessionManager $sessionManager,
-        protected ?RequestHandler $requestHandler = null,
+        protected ?Dispatcher $dispatcher = null,
         protected ?SubscriptionManager $subscriptionManager = null,
     ) {
         $this->logger = $this->configuration->logger;
         $this->subscriptionManager ??= new SubscriptionManager($this->logger);
-        $this->requestHandler ??= new RequestHandler($this->configuration, $this->registry, $this->subscriptionManager);
+        $this->dispatcher ??= new Dispatcher($this->configuration, $this->registry, $this->subscriptionManager);
 
         $this->sessionManager->on('session_deleted', function (string $sessionId) {
             $this->subscriptionManager->cleanupSession($sessionId);
@@ -174,7 +174,7 @@ private function processRequest(Request $request, SessionInterface $session): Re
 
             $this->assertRequestCapability($request->method);
 
-            $result = $this->requestHandler->handleRequest($request, $session);
+            $result = $this->dispatcher->handleRequest($request, $session);
 
             return Response::make($request->id, $result);
         } catch (McpServerException $e) {
@@ -207,7 +207,7 @@ private function processNotification(Notification $notification, SessionInterfac
         $params = $notification->params;
 
         try {
-            $this->requestHandler->handleNotification($notification, $session);
+            $this->dispatcher->handleNotification($notification, $session);
         } catch (Throwable $e) {
             $this->logger->error('Error while processing notification', ['method' => $method, 'exception' => $e->getMessage()]);
             return;