Move examples to server directory (#198)

Nyholm · web-flow · commit 6dac6f3b4a48 · 2025-12-27T15:39:05.000+01:00
* move examples to server directory This will prepare for the client implementation in #192 * fix move bootstrap too
diff --git a/composer.json b/composer.json
@@ -51,18 +51,18 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Mcp\\Example\\CachedDiscovery\\": "examples/cached-discovery/",
-      "Mcp\\Example\\ClientCommunication\\": "examples/client-communication/",
-      "Mcp\\Example\\CombinedRegistration\\": "examples/combined-registration/",
-      "Mcp\\Example\\ComplexToolSchema\\": "examples/complex-tool-schema/",
-      "Mcp\\Example\\CustomDependencies\\": "examples/custom-dependencies/",
-      "Mcp\\Example\\CustomMethodHandlers\\": "examples/custom-method-handlers/",
-      "Mcp\\Example\\DiscoveryCalculator\\": "examples/discovery-calculator/",
-      "Mcp\\Example\\DiscoveryUserProfile\\": "examples/discovery-userprofile/",
-      "Mcp\\Example\\EnvVariables\\": "examples/env-variables/",
-      "Mcp\\Example\\ExplicitRegistration\\": "examples/explicit-registration/",
-      "Mcp\\Example\\SchemaShowcase\\": "examples/schema-showcase/",
-      "Mcp\\Example\\ClientLogging\\": "examples/client-logging/",
+      "Mcp\\Example\\Server\\CachedDiscovery\\": "examples/server/cached-discovery/",
+      "Mcp\\Example\\Server\\ClientCommunication\\": "examples/server/client-communication/",
+      "Mcp\\Example\\Server\\CombinedRegistration\\": "examples/server/combined-registration/",
+      "Mcp\\Example\\Server\\ComplexToolSchema\\": "examples/server/complex-tool-schema/",
+      "Mcp\\Example\\Server\\CustomDependencies\\": "examples/server/custom-dependencies/",
+      "Mcp\\Example\\Server\\CustomMethodHandlers\\": "examples/server/custom-method-handlers/",
+      "Mcp\\Example\\Server\\DiscoveryCalculator\\": "examples/server/discovery-calculator/",
+      "Mcp\\Example\\Server\\DiscoveryUserProfile\\": "examples/server/discovery-userprofile/",
+      "Mcp\\Example\\Server\\EnvVariables\\": "examples/server/env-variables/",
+      "Mcp\\Example\\Server\\ExplicitRegistration\\": "examples/server/explicit-registration/",
+      "Mcp\\Example\\Server\\SchemaShowcase\\": "examples/server/schema-showcase/",
+      "Mcp\\Example\\Server\\ClientLogging\\": "examples/server/client-logging/",
       "Mcp\\Tests\\": "tests/"
     }
   },
diff --git a/examples/server/README.md b/examples/server/README.md
diff --git a/examples/server/bootstrap.php b/examples/server/bootstrap.php
@@ -19,7 +19,7 @@
 use Psr\Log\AbstractLogger;
 use Psr\Log\LoggerInterface;
 
-require_once dirname(__DIR__).'/vendor/autoload.php';
+require_once dirname(__DIR__, 2).'/vendor/autoload.php';
 
 set_exception_handler(function (Throwable $t): never {
     logger()->critical('Uncaught exception: '.$t->getMessage(), ['exception' => $t]);
diff --git a/examples/server/cached-discovery/CachedCalculatorElements.php b/examples/server/cached-discovery/CachedCalculatorElements.php
@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\CachedDiscovery;
+namespace Mcp\Example\Server\CachedDiscovery;
 
 use Mcp\Capability\Attribute\McpTool;
 use Mcp\Exception\ToolCallException;
diff --git a/examples/server/cached-discovery/server.php b/examples/server/cached-discovery/server.php
diff --git a/examples/server/client-communication/ClientAwareService.php b/examples/server/client-communication/ClientAwareService.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\ClientCommunication;
+namespace Mcp\Example\Server\ClientCommunication;
 
 use Mcp\Capability\Attribute\McpTool;
 use Mcp\Schema\Content\TextContent;
diff --git a/examples/server/client-communication/server.php b/examples/server/client-communication/server.php
diff --git a/examples/server/client-logging/LoggingShowcaseHandlers.php b/examples/server/client-logging/LoggingShowcaseHandlers.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\ClientLogging;
+namespace Mcp\Example\Server\ClientLogging;
 
 use Mcp\Capability\Attribute\McpTool;
 use Mcp\Capability\Logger\ClientLogger;
diff --git a/examples/server/client-logging/server.php b/examples/server/client-logging/server.php
diff --git a/examples/server/combined-registration/DiscoveredElements.php b/examples/server/combined-registration/DiscoveredElements.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\CombinedRegistration;
+namespace Mcp\Example\Server\CombinedRegistration;
 
 use Mcp\Capability\Attribute\McpResource;
 use Mcp\Capability\Attribute\McpTool;
diff --git a/examples/server/combined-registration/ManualHandlers.php b/examples/server/combined-registration/ManualHandlers.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\CombinedRegistration;
+namespace Mcp\Example\Server\CombinedRegistration;
 
 use Psr\Log\LoggerInterface;
 
diff --git a/examples/server/combined-registration/server.php b/examples/server/combined-registration/server.php
@@ -13,7 +13,7 @@
 require_once dirname(__DIR__).'/bootstrap.php';
 chdir(__DIR__);
 
-use Mcp\Example\CombinedRegistration\ManualHandlers;
+use Mcp\Example\Server\CombinedRegistration\ManualHandlers;
 use Mcp\Server;
 use Mcp\Server\Session\FileSessionStore;
 
diff --git a/examples/server/complex-tool-schema/McpEventScheduler.php b/examples/server/complex-tool-schema/McpEventScheduler.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\ComplexToolSchema;
+namespace Mcp\Example\Server\ComplexToolSchema;
 
 use Mcp\Capability\Attribute\McpTool;
-use Mcp\Example\ComplexToolSchema\Model\EventPriority;
-use Mcp\Example\ComplexToolSchema\Model\EventType;
+use Mcp\Example\Server\ComplexToolSchema\Model\EventPriority;
+use Mcp\Example\Server\ComplexToolSchema\Model\EventType;
 use Psr\Log\LoggerInterface;
 
 final class McpEventScheduler
diff --git a/examples/server/complex-tool-schema/Model/EventPriority.php b/examples/server/complex-tool-schema/Model/EventPriority.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\ComplexToolSchema\Model;
+namespace Mcp\Example\Server\ComplexToolSchema\Model;
 
 enum EventPriority: int
 {
diff --git a/examples/server/complex-tool-schema/Model/EventType.php b/examples/server/complex-tool-schema/Model/EventType.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\ComplexToolSchema\Model;
+namespace Mcp\Example\Server\ComplexToolSchema\Model;
 
 enum EventType: string
 {
diff --git a/examples/server/complex-tool-schema/server.php b/examples/server/complex-tool-schema/server.php
diff --git a/examples/server/custom-dependencies/McpTaskHandlers.php b/examples/server/custom-dependencies/McpTaskHandlers.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\CustomDependencies;
+namespace Mcp\Example\Server\CustomDependencies;
 
 use Mcp\Capability\Attribute\McpResource;
 use Mcp\Capability\Attribute\McpTool;
-use Mcp\Example\CustomDependencies\Service\StatsServiceInterface;
-use Mcp\Example\CustomDependencies\Service\TaskRepositoryInterface;
+use Mcp\Example\Server\CustomDependencies\Service\StatsServiceInterface;
+use Mcp\Example\Server\CustomDependencies\Service\TaskRepositoryInterface;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/examples/server/custom-dependencies/Service/InMemoryTaskRepository.php b/examples/server/custom-dependencies/Service/InMemoryTaskRepository.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\CustomDependencies\Service;
+namespace Mcp\Example\Server\CustomDependencies\Service;
 
 use Psr\Log\LoggerInterface;
 
diff --git a/examples/server/custom-dependencies/Service/StatsServiceInterface.php b/examples/server/custom-dependencies/Service/StatsServiceInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\CustomDependencies\Service;
+namespace Mcp\Example\Server\CustomDependencies\Service;
 
 interface StatsServiceInterface
 {
diff --git a/examples/server/custom-dependencies/Service/SystemStatsService.php b/examples/server/custom-dependencies/Service/SystemStatsService.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\CustomDependencies\Service;
+namespace Mcp\Example\Server\CustomDependencies\Service;
 
 final class SystemStatsService implements StatsServiceInterface
 {
diff --git a/examples/server/custom-dependencies/Service/TaskRepositoryInterface.php b/examples/server/custom-dependencies/Service/TaskRepositoryInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\CustomDependencies\Service;
+namespace Mcp\Example\Server\CustomDependencies\Service;
 
 /**
  * @phpstan-type Task array{id: int, userId: string, description: string, completed: bool, createdAt: string}
diff --git a/examples/server/custom-dependencies/server.php b/examples/server/custom-dependencies/server.php
@@ -13,10 +13,10 @@
 require_once dirname(__DIR__).'/bootstrap.php';
 chdir(__DIR__);
 
-use Mcp\Example\CustomDependencies\Service\InMemoryTaskRepository;
-use Mcp\Example\CustomDependencies\Service\StatsServiceInterface;
-use Mcp\Example\CustomDependencies\Service\SystemStatsService;
-use Mcp\Example\CustomDependencies\Service\TaskRepositoryInterface;
+use Mcp\Example\Server\CustomDependencies\Service\InMemoryTaskRepository;
+use Mcp\Example\Server\CustomDependencies\Service\StatsServiceInterface;
+use Mcp\Example\Server\CustomDependencies\Service\SystemStatsService;
+use Mcp\Example\Server\CustomDependencies\Service\TaskRepositoryInterface;
 use Mcp\Server;
 use Mcp\Server\Session\FileSessionStore;
 
diff --git a/examples/server/custom-method-handlers/CallToolRequestHandler.php b/examples/server/custom-method-handlers/CallToolRequestHandler.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\CustomMethodHandlers;
+namespace Mcp\Example\Server\CustomMethodHandlers;
 
 use Mcp\Schema\Content\TextContent;
 use Mcp\Schema\JsonRpc\Error;
diff --git a/examples/server/custom-method-handlers/ListToolsRequestHandler.php b/examples/server/custom-method-handlers/ListToolsRequestHandler.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\CustomMethodHandlers;
+namespace Mcp\Example\Server\CustomMethodHandlers;
 
 use Mcp\Schema\JsonRpc\Request;
 use Mcp\Schema\JsonRpc\Response;
diff --git a/examples/server/custom-method-handlers/server.php b/examples/server/custom-method-handlers/server.php
@@ -13,8 +13,8 @@
 require_once dirname(__DIR__).'/bootstrap.php';
 chdir(__DIR__);
 
-use Mcp\Example\CustomMethodHandlers\CallToolRequestHandler;
-use Mcp\Example\CustomMethodHandlers\ListToolsRequestHandler;
+use Mcp\Example\Server\CustomMethodHandlers\CallToolRequestHandler;
+use Mcp\Example\Server\CustomMethodHandlers\ListToolsRequestHandler;
 use Mcp\Schema\ServerCapabilities;
 use Mcp\Schema\Tool;
 use Mcp\Server;
diff --git a/examples/server/discovery-calculator/McpElements.php b/examples/server/discovery-calculator/McpElements.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\DiscoveryCalculator;
+namespace Mcp\Example\Server\DiscoveryCalculator;
 
 use Mcp\Capability\Attribute\McpResource;
 use Mcp\Capability\Attribute\McpTool;
diff --git a/examples/server/discovery-calculator/server.php b/examples/server/discovery-calculator/server.php
diff --git a/examples/server/discovery-userprofile/McpElements.php b/examples/server/discovery-userprofile/McpElements.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\DiscoveryUserProfile;
+namespace Mcp\Example\Server\DiscoveryUserProfile;
 
 use Mcp\Capability\Attribute\CompletionProvider;
 use Mcp\Capability\Attribute\McpPrompt;
diff --git a/examples/server/discovery-userprofile/UserIdCompletionProvider.php b/examples/server/discovery-userprofile/UserIdCompletionProvider.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\DiscoveryUserProfile;
+namespace Mcp\Example\Server\DiscoveryUserProfile;
 
 use Mcp\Capability\Completion\ProviderInterface;
 
diff --git a/examples/server/discovery-userprofile/server.php b/examples/server/discovery-userprofile/server.php
diff --git a/examples/server/env-variables/EnvToolHandler.php b/examples/server/env-variables/EnvToolHandler.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\EnvVariables;
+namespace Mcp\Example\Server\EnvVariables;
 
 use Mcp\Capability\Attribute\McpTool;
 
diff --git a/examples/server/env-variables/server.php b/examples/server/env-variables/server.php
diff --git a/examples/server/explicit-registration/SimpleHandlers.php b/examples/server/explicit-registration/SimpleHandlers.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\ExplicitRegistration;
+namespace Mcp\Example\Server\ExplicitRegistration;
 
 use Psr\Log\LoggerInterface;
 
diff --git a/examples/server/explicit-registration/server.php b/examples/server/explicit-registration/server.php
@@ -13,7 +13,7 @@
 require_once dirname(__DIR__).'/bootstrap.php';
 chdir(__DIR__);
 
-use Mcp\Example\ExplicitRegistration\SimpleHandlers;
+use Mcp\Example\Server\ExplicitRegistration\SimpleHandlers;
 use Mcp\Schema\ServerCapabilities;
 use Mcp\Server;
 
diff --git a/examples/server/schema-showcase/SchemaShowcaseElements.php b/examples/server/schema-showcase/SchemaShowcaseElements.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\SchemaShowcase;
+namespace Mcp\Example\Server\SchemaShowcase;
 
 use Mcp\Capability\Attribute\McpTool;
 use Mcp\Capability\Attribute\Schema;
diff --git a/examples/server/schema-showcase/server.php b/examples/server/schema-showcase/server.php
diff --git a/tests/Inspector/Http/HttpClientCommunicationTest.php b/tests/Inspector/Http/HttpClientCommunicationTest.php
@@ -59,6 +59,6 @@ public static function provideMethods(): array
 
     protected function getServerScript(): string
     {
-        return \dirname(__DIR__, 3).'/examples/client-communication/server.php';
+        return \dirname(__DIR__, 3).'/examples/server/client-communication/server.php';
     }
 }
diff --git a/tests/Inspector/Http/HttpCombinedRegistrationTest.php b/tests/Inspector/Http/HttpCombinedRegistrationTest.php
@@ -45,6 +45,6 @@ public static function provideMethods(): array
 
     protected function getServerScript(): string
     {
-        return \dirname(__DIR__, 3).'/examples/combined-registration/server.php';
+        return \dirname(__DIR__, 3).'/examples/server/combined-registration/server.php';
     }
 }
diff --git a/tests/Inspector/Http/HttpComplexToolSchemaTest.php b/tests/Inspector/Http/HttpComplexToolSchemaTest.php
@@ -82,6 +82,6 @@ public static function provideMethods(): array
 
     protected function getServerScript(): string
     {
-        return \dirname(__DIR__, 3).'/examples/complex-tool-schema/server.php';
+        return \dirname(__DIR__, 3).'/examples/server/complex-tool-schema/server.php';
     }
 }
diff --git a/tests/Inspector/Http/HttpDiscoveryUserProfileTest.php b/tests/Inspector/Http/HttpDiscoveryUserProfileTest.php
@@ -67,6 +67,6 @@ public static function provideMethods(): array
 
     protected function getServerScript(): string
     {
-        return \dirname(__DIR__, 3).'/examples/discovery-userprofile/server.php';
+        return \dirname(__DIR__, 3).'/examples/server/discovery-userprofile/server.php';
     }
 }
diff --git a/tests/Inspector/Http/HttpSchemaShowcaseTest.php b/tests/Inspector/Http/HttpSchemaShowcaseTest.php
@@ -87,7 +87,7 @@ public static function provideMethods(): array
 
     protected function getServerScript(): string
     {
-        return \dirname(__DIR__, 3).'/examples/schema-showcase/server.php';
+        return \dirname(__DIR__, 3).'/examples/server/schema-showcase/server.php';
     }
 
     protected function normalizeTestOutput(string $output, ?string $testName = null): string
diff --git a/tests/Inspector/Stdio/StdioCachedDiscoveryTest.php b/tests/Inspector/Stdio/StdioCachedDiscoveryTest.php
@@ -88,6 +88,6 @@ public static function provideMethods(): array
 
     protected function getServerScript(): string
     {
-        return \dirname(__DIR__, 3).'/examples/cached-discovery/server.php';
+        return \dirname(__DIR__, 3).'/examples/server/cached-discovery/server.php';
     }
 }
diff --git a/tests/Inspector/Stdio/StdioCustomDependenciesTest.php b/tests/Inspector/Stdio/StdioCustomDependenciesTest.php
@@ -55,7 +55,7 @@ public static function provideMethods(): array
 
     protected function getServerScript(): string
     {
-        return \dirname(__DIR__, 3).'/examples/custom-dependencies/server.php';
+        return \dirname(__DIR__, 3).'/examples/server/custom-dependencies/server.php';
     }
 
     protected function normalizeTestOutput(string $output, ?string $testName = null): string
diff --git a/tests/Inspector/Stdio/StdioDiscoveryCalculatorTest.php b/tests/Inspector/Stdio/StdioDiscoveryCalculatorTest.php
@@ -45,6 +45,6 @@ public static function provideMethods(): array
 
     protected function getServerScript(): string
     {
-        return \dirname(__DIR__, 3).'/examples/discovery-calculator/server.php';
+        return \dirname(__DIR__, 3).'/examples/server/discovery-calculator/server.php';
     }
 }
diff --git a/tests/Inspector/Stdio/StdioEnvVariablesTest.php b/tests/Inspector/Stdio/StdioEnvVariablesTest.php
@@ -50,6 +50,6 @@ public static function provideMethods(): array
 
     protected function getServerScript(): string
     {
-        return \dirname(__DIR__, 3).'/examples/env-variables/server.php';
+        return \dirname(__DIR__, 3).'/examples/server/env-variables/server.php';
     }
 }
diff --git a/tests/Inspector/Stdio/StdioExplicitRegistrationTest.php b/tests/Inspector/Stdio/StdioExplicitRegistrationTest.php
@@ -77,6 +77,6 @@ public static function provideMethods(): array
 
     protected function getServerScript(): string
     {
-        return \dirname(__DIR__, 3).'/examples/explicit-registration/server.php';
+        return \dirname(__DIR__, 3).'/examples/server/explicit-registration/server.php';
     }
 }
