[Server] Registry Architecture Refactoring - Enhanced Separation of Concerns

examples/09-standalone-cli/src/ExampleTool.php

@@ -12,15 +12,15 @@
 namespace App;
 
 use Mcp\Capability\Tool\MetadataInterface;
-use Mcp\Capability\Tool\ToolExecutorInterface;
+use Mcp\Capability\Tool\ToolCallerInterface;
 use Mcp\Schema\Content\TextContent;
 use Mcp\Schema\Request\CallToolRequest;
 use Mcp\Schema\Result\CallToolResult;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class ExampleTool implements MetadataInterface, ToolExecutorInterface
+class ExampleTool implements MetadataInterface, ToolCallerInterface
 {
     public function call(CallToolRequest $request): CallToolResult
     {

phpstan-baseline.neon

@@ -367,149 +367,53 @@ parameters:
 			path: examples/08-schema-showcase-streamable/server.php
 
 		-
-			message: '#^Parameter \#1 \$registry of class Mcp\\Server\\RequestHandler\\CallToolHandler constructor expects Mcp\\Capability\\Registry, Mcp\\Capability\\ToolChain given\.$#'
+			message: '#^Parameter \#1 \$registry of class Mcp\\Server\\RequestHandler\\ListPromptsHandler constructor expects Mcp\\Capability\\Registry\\ReferenceProviderInterface, Mcp\\Capability\\PromptChain given\.$#'
 			identifier: argument.type
 			count: 1
 			path: examples/09-standalone-cli/src/Builder.php
 
 		-
-			message: '#^Parameter \#1 \$registry of class Mcp\\Server\\RequestHandler\\GetPromptHandler constructor expects Mcp\\Capability\\Registry, Mcp\\Capability\\PromptChain given\.$#'
+			message: '#^Parameter \#1 \$registry of class Mcp\\Server\\RequestHandler\\ListResourcesHandler constructor expects Mcp\\Capability\\Registry\\ReferenceProviderInterface, Mcp\\Capability\\ResourceChain given\.$#'
 			identifier: argument.type
 			count: 1
 			path: examples/09-standalone-cli/src/Builder.php
 
 		-
-			message: '#^Parameter \#1 \$registry of class Mcp\\Server\\RequestHandler\\ListPromptsHandler constructor expects Mcp\\Capability\\Registry, Mcp\\Capability\\PromptChain given\.$#'
+			message: '#^Parameter \#1 \$registry of class Mcp\\Server\\RequestHandler\\ListToolsHandler constructor expects Mcp\\Capability\\Registry\\ReferenceProviderInterface, Mcp\\Capability\\ToolChain given\.$#'
 			identifier: argument.type
 			count: 1
 			path: examples/09-standalone-cli/src/Builder.php
 
 		-
-			message: '#^Parameter \#1 \$registry of class Mcp\\Server\\RequestHandler\\ListResourcesHandler constructor expects Mcp\\Capability\\Registry, Mcp\\Capability\\ResourceChain given\.$#'
-			identifier: argument.type
-			count: 1
-			path: examples/09-standalone-cli/src/Builder.php
-
-		-
-			message: '#^Parameter \#1 \$registry of class Mcp\\Server\\RequestHandler\\ListToolsHandler constructor expects Mcp\\Capability\\Registry, Mcp\\Capability\\ToolChain given\.$#'
-			identifier: argument.type
-			count: 1
-			path: examples/09-standalone-cli/src/Builder.php
-
-		-
-			message: '#^Parameter \#1 \$registry of class Mcp\\Server\\RequestHandler\\ReadResourceHandler constructor expects Mcp\\Capability\\Registry, Mcp\\Capability\\ResourceChain given\.$#'
-			identifier: argument.type
-			count: 1
-			path: examples/09-standalone-cli/src/Builder.php
-
-		-
-			message: '#^Call to protected method formatResult\(\) of class Mcp\\Capability\\Registry\\ResourceReference\.$#'
-			identifier: method.protected
-			count: 1
-			path: src/Capability/Registry.php
-
-		-
-			message: '#^Cannot import type alias CallableArray\: type alias does not exist in Mcp\\Capability\\Registry\\ElementReference\.$#'
-			identifier: typeAlias.notFound
-			count: 1
-			path: src/Capability/Registry.php
-
-		-
-			message: '#^Method Mcp\\Capability\\Registry\:\:handleCallTool\(\) has parameter \$arguments with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/Capability/Registry.php
-
-		-
-			message: '#^Method Mcp\\Capability\\Registry\:\:handleCallTool\(\) return type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/Capability/Registry.php
-
-		-
-			message: '#^Method Mcp\\Capability\\Registry\:\:handleGetPrompt\(\) has parameter \$arguments with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/Capability/Registry.php
-
-		-
-			message: '#^Method Mcp\\Capability\\Registry\:\:registerPrompt\(\) has parameter \$handler with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/Capability/Registry.php
-
-		-
-			message: '#^Method Mcp\\Capability\\Registry\:\:registerResource\(\) has parameter \$handler with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/Capability/Registry.php
-
-		-
-			message: '#^Method Mcp\\Capability\\Registry\:\:registerResourceTemplate\(\) has parameter \$handler with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/Capability/Registry.php
-
-		-
-			message: '#^Method Mcp\\Capability\\Registry\:\:registerTool\(\) has parameter \$handler with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/Capability/Registry.php
-
-		-
-			message: '#^PHPDoc tag @param for parameter \$handler with type \(callable\)\|Mcp\\Capability\\CallableArray\|string is not subtype of native type array\|\(callable\)\|string\.$#'
-			identifier: parameter.phpDocType
-			count: 4
-			path: src/Capability/Registry.php
-
-		-
-			message: '#^Parameter \$handler of method Mcp\\Capability\\Registry\:\:registerPrompt\(\) has invalid type Mcp\\Capability\\CallableArray\.$#'
-			identifier: class.notFound
+			message: '#^PHPDoc tag @return with type array is incompatible with native type object\.$#'
+			identifier: return.phpDocType
 			count: 1
-			path: src/Capability/Registry.php
+			path: src/Schema/Result/EmptyResult.php
 
 		-
-			message: '#^Parameter \$handler of method Mcp\\Capability\\Registry\:\:registerResource\(\) has invalid type Mcp\\Capability\\CallableArray\.$#'
-			identifier: class.notFound
+			message: '#^Method Mcp\\Schema\\Result\\ReadResourceResult\:\:jsonSerialize\(\) should return array\{contents\: array\<Mcp\\Schema\\Content\\BlobResourceContents\|Mcp\\Schema\\Content\\TextResourceContents\>\} but returns array\{contents\: array\<Mcp\\Schema\\Content\\ResourceContents\>\}\.$#'
+			identifier: return.type
 			count: 1
-			path: src/Capability/Registry.php
+			path: src/Schema/Result/ReadResourceResult.php
 
 		-
-			message: '#^Parameter \$handler of method Mcp\\Capability\\Registry\:\:registerResourceTemplate\(\) has invalid type Mcp\\Capability\\CallableArray\.$#'
-			identifier: class.notFound
+			message: '#^Result of && is always false\.$#'
+			identifier: booleanAnd.alwaysFalse
 			count: 1
-			path: src/Capability/Registry.php
+			path: src/Server/RequestHandler/ListResourcesHandler.php
 
 		-
-			message: '#^Parameter \$handler of method Mcp\\Capability\\Registry\:\:registerTool\(\) has invalid type Mcp\\Capability\\CallableArray\.$#'
-			identifier: class.notFound
+			message: '#^Method Mcp\\Capability\\Registry\\ReferenceProviderInterface\:\:getPrompts\(\) invoked with 2 parameters, 0 required\.$#'
+			identifier: arguments.count
 			count: 1
-			path: src/Capability/Registry.php
+			path: src/Server/RequestHandler/ListPromptsHandler.php
 
 		-
 			message: '#^Call to an undefined method Mcp\\Capability\\Registry\\ResourceTemplateReference\:\:handle\(\)\.$#'
 			identifier: method.notFound
 			count: 1
 			path: src/Capability/Registry/ResourceTemplateReference.php
 
-		-
-			message: '#^PHPDoc tag @return with type array is incompatible with native type object\.$#'
-			identifier: return.phpDocType
-			count: 1
-			path: src/Schema/Result/EmptyResult.php
-
-		-
-			message: '#^Method Mcp\\Schema\\Result\\ReadResourceResult\:\:jsonSerialize\(\) should return array\{contents\: array\<Mcp\\Schema\\Content\\BlobResourceContents\|Mcp\\Schema\\Content\\TextResourceContents\>\} but returns array\{contents\: array\<Mcp\\Schema\\Content\\ResourceContents\>\}\.$#'
-			identifier: return.type
-			count: 1
-			path: src/Schema/Result/ReadResourceResult.php
-
-		-
-			message: '#^Method Mcp\\Capability\\Registry\:\:getPrompts\(\) invoked with 2 parameters, 0 required\.$#'
-			identifier: arguments.count
-			count: 1
-			path: src/Server/RequestHandler/ListPromptsHandler.php
-
 		-
 			message: '#^Result of && is always false\.$#'
 			identifier: booleanAnd.alwaysFalse
@@ -523,29 +427,23 @@ parameters:
 			path: src/Server/RequestHandler/ListPromptsHandler.php
 
 		-
-			message: '#^Method Mcp\\Capability\\Registry\:\:getResources\(\) invoked with 2 parameters, 0 required\.$#'
+			message: '#^Method Mcp\\Capability\\Registry\\ReferenceProviderInterface\:\:getResources\(\) invoked with 2 parameters, 0 required\.$#'
 			identifier: arguments.count
 			count: 1
 			path: src/Server/RequestHandler/ListResourcesHandler.php
 
 		-
-			message: '#^Result of && is always false\.$#'
-			identifier: booleanAnd.alwaysFalse
+			message: '#^Method Mcp\\Capability\\Registry\\ReferenceProviderInterface\:\:getTools\(\) invoked with 2 parameters, 0 required\.$#'
+			identifier: arguments.count
 			count: 1
-			path: src/Server/RequestHandler/ListResourcesHandler.php
+			path: src/Server/RequestHandler/ListToolsHandler.php
 
 		-
 			message: '#^Strict comparison using \!\=\= between null and null will always evaluate to false\.$#'
 			identifier: notIdentical.alwaysFalse
 			count: 1
 			path: src/Server/RequestHandler/ListResourcesHandler.php
 
-		-
-			message: '#^Method Mcp\\Capability\\Registry\:\:getTools\(\) invoked with 2 parameters, 0 required\.$#'
-			identifier: arguments.count
-			count: 1
-			path: src/Server/RequestHandler/ListToolsHandler.php
-
 		-
 			message: '#^Result of && is always false\.$#'
 			identifier: booleanAnd.alwaysFalse

src/Capability/Discovery/Discoverer.php

@@ -19,7 +19,7 @@
 use Mcp\Capability\Prompt\Completion\EnumCompletionProvider;
 use Mcp\Capability\Prompt\Completion\ListCompletionProvider;
 use Mcp\Capability\Prompt\Completion\ProviderInterface;
-use Mcp\Capability\Registry;
+use Mcp\Capability\Registry\ReferenceRegistryInterface;
 use Mcp\Exception\ExceptionInterface;
 use Mcp\Schema\Prompt;
 use Mcp\Schema\PromptArgument;
@@ -44,7 +44,7 @@
 class Discoverer
 {
     public function __construct(
-        private readonly Registry $registry,
+        private readonly ReferenceRegistryInterface $registry,
         private readonly LoggerInterface $logger = new NullLogger(),
         private ?DocBlockParser $docBlockParser = null,
         private ?SchemaGenerator $schemaGenerator = null,

src/Capability/Prompt/PromptGetter.php

@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the official PHP MCP SDK.
+ *
+ * A collaboration between Symfony and the PHP Foundation.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Mcp\Capability\Prompt;
+
+use Mcp\Capability\Registry\ReferenceHandlerInterface;
+use Mcp\Capability\Registry\ReferenceProviderInterface;
+use Mcp\Exception\PromptGetException;
+use Mcp\Exception\PromptNotFoundException;
+use Mcp\Schema\Request\GetPromptRequest;
+use Mcp\Schema\Result\GetPromptResult;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
+
+/**
+ * @author Pavel Buchnev <[email protected]>
+ */
+final class PromptGetter implements PromptGetterInterface
+{
+    public function __construct(
+        private readonly ReferenceProviderInterface $referenceProvider,
+        private readonly ReferenceHandlerInterface $referenceHandler,
+        private readonly LoggerInterface $logger = new NullLogger(),
+    ) {
+    }
+
+    public function get(GetPromptRequest $request): GetPromptResult
+    {
+        $promptName = $request->name;
+        $arguments = $request->arguments ?? [];
+
+        $this->logger->debug('Getting prompt', ['name' => $promptName, 'arguments' => $arguments]);
+
+        $reference = $this->referenceProvider->getPrompt($promptName);
+
+        if (null === $reference) {
+            $this->logger->warning('Prompt not found', ['name' => $promptName]);
+            throw new PromptNotFoundException($request);
+        }
+
+        try {
+            $result = $this->referenceHandler->handle($reference, $arguments);
+            $formattedResult = $reference->formatResult($result);
+
+            $this->logger->debug('Prompt retrieved successfully', [
+                'name' => $promptName,
+                'result_type' => \gettype($result),
+            ]);
+
+            return new GetPromptResult($formattedResult);
+        } catch (\Throwable $e) {
+            $this->logger->error('Prompt retrieval failed', [
+                'name' => $promptName,
+                'exception' => $e->getMessage(),
+                'trace' => $e->getTraceAsString(),
+            ]);
+
+            throw new PromptGetException($request, $e);
+        }
+    }
+}