Merge branch 'main' into support-server-notifications

Author: Bellangelo

.gitattributes

@@ -2,5 +2,6 @@
 /examples export-ignore
 /tests export-ignore
 /.php-cs-fixer.dist.php export-ignore
-/phpstan.dist.neon export-ignore
+/phpstan* export-ignore
 /phpunit.xml.dist export-ignore
+/Makefile export-ignore

.github/workflows/pipeline.yaml

@@ -30,9 +30,6 @@ jobs:
         with:
           dependency-versions: "${{ matrix.dependencies }}"
 
-      - name: Install PHP Dependencies
-        run: composer install --no-scripts
-
       - name: Tests
         run: vendor/bin/phpunit --exclude-group inspector
 
@@ -54,9 +51,6 @@ jobs:
       - name: Install Composer
         uses: "ramsey/composer-install@v3"
 
-      - name: Install PHP Dependencies
-        run: composer install --no-scripts
-
       - name: Code Style PHP
         run: vendor/bin/php-cs-fixer fix --dry-run
 

README.md

@@ -4,8 +4,8 @@ The official PHP SDK for Model Context Protocol (MCP). It provides a framework-a
 
 > [!IMPORTANT]
 > Currently, we are still in the process of merging [Symfony's MCP SDK](https://github.com/symfony/mcp-sdk) and
-> [PHP-MCP](https://github.com/php-mcp) components. Not all code paths are fully tested, complete, or this package
-> may contain duplicate functionality or dead code.
+> [PHP-MCP](https://github.com/php-mcp) components. Not all code paths are fully tested or complete, and this package
+> may still contain duplicate functionality or dead code.
 > 
 > If you want to help us stabilize the SDK, please see the
 > [issue tracker](https://github.com/modelcontextprotocol/php-sdk/issues).
@@ -98,8 +98,8 @@ use Mcp\Server;
 use Mcp\Server\Transport\StdioTransport;
 
 Server::make()
-    ->withServerInfo('Stdio Calculator', '1.1.0', 'Basic Calculator over STDIO transport.')
-    ->withDiscovery(__DIR__, ['.'])
+    ->setServerInfo('Stdio Calculator', '1.1.0', 'Basic Calculator over STDIO transport.')
+    ->setDiscovery(__DIR__, ['.'])
     ->build()
     ->connect(new StdioTransport());
 ```

examples/01-discovery-stdio-calculator/server.php

@@ -19,10 +19,10 @@
 logger()->info('Starting MCP Stdio Calculator Server...');
 
 Server::make()
-    ->withServerInfo('Stdio Calculator', '1.1.0', 'Basic Calculator over STDIO transport.')
-    ->withContainer(container())
-    ->withLogger(logger())
-    ->withDiscovery(__DIR__, ['.'])
+    ->setServerInfo('Stdio Calculator', '1.1.0', 'Basic Calculator over STDIO transport.')
+    ->setContainer(container())
+    ->setLogger(logger())
+    ->setDiscovery(__DIR__, ['.'])
     ->build()
     ->connect(new StdioTransport(logger: logger()));
 

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

@@ -24,11 +24,11 @@
 $container->set(LoggerInterface::class, logger());
 
 Server::make()
-    ->withServerInfo('HTTP User Profiles', '1.0.0')
-    ->withLogger(logger())
-    ->withContainer($container)
-    ->withDiscovery(__DIR__, ['.'])
-    ->withTool(
+    ->setServerInfo('HTTP User Profiles', '1.0.0')
+    ->setLogger(logger())
+    ->setContainer($container)
+    ->setDiscovery(__DIR__, ['.'])
+    ->addTool(
         function (float $a, float $b, string $operation = 'add'): array {
             $result = match ($operation) {
                 'add' => $a + $b,
@@ -47,7 +47,7 @@ function (float $a, float $b, string $operation = 'add'): array {
         name: 'calculator',
         description: 'Perform basic math operations (add, subtract, multiply, divide)'
     )
-    ->withResource(
+    ->addResource(
         function (): array {
             $memoryUsage = memory_get_usage(true);
             $memoryPeak = memory_get_peak_usage(true);

examples/03-manual-registration-stdio/server.php

@@ -20,13 +20,13 @@
 logger()->info('Starting MCP Manual Registration (Stdio) Server...');
 
 Server::make()
-    ->withServerInfo('Manual Reg Server', '1.0.0')
-    ->withLogger(logger())
-    ->withContainer(container())
-    ->withTool([SimpleHandlers::class, 'echoText'], 'echo_text')
-    ->withResource([SimpleHandlers::class, 'getAppVersion'], 'app://version', 'application_version', mimeType: 'text/plain')
-    ->withPrompt([SimpleHandlers::class, 'greetingPrompt'], 'personalized_greeting')
-    ->withResourceTemplate([SimpleHandlers::class, 'getItemDetails'], 'item://{itemId}/details', 'get_item_details', mimeType: 'application/json')
+    ->setServerInfo('Manual Reg Server', '1.0.0')
+    ->setLogger(logger())
+    ->setContainer(container())
+    ->addTool([SimpleHandlers::class, 'echoText'], 'echo_text')
+    ->addResource([SimpleHandlers::class, 'getAppVersion'], 'app://version', 'application_version', mimeType: 'text/plain')
+    ->addPrompt([SimpleHandlers::class, 'greetingPrompt'], 'personalized_greeting')
+    ->addResourceTemplate([SimpleHandlers::class, 'getItemDetails'], 'item://{itemId}/details', 'get_item_details', mimeType: 'application/json')
     ->build()
     ->connect(new StdioTransport(logger: logger()));
 

examples/04-combined-registration-http/server.php

@@ -20,12 +20,12 @@
 logger()->info('Starting MCP Combined Registration (HTTP) Server...');
 
 Server::make()
-    ->withServerInfo('Combined HTTP Server', '1.0.0')
-    ->withLogger(logger())
-    ->withContainer(container())
-    ->withDiscovery(__DIR__, ['.'])
-    ->withTool([ManualHandlers::class, 'manualGreeter'])
-    ->withResource(
+    ->setServerInfo('Combined HTTP Server', '1.0.0')
+    ->setLogger(logger())
+    ->setContainer(container())
+    ->setDiscovery(__DIR__, ['.'])
+    ->addTool([ManualHandlers::class, 'manualGreeter'])
+    ->addResource(
         [ManualHandlers::class, 'getPriorityConfigManual'],
         'config://priority',
         'priority_config_manual',

examples/05-stdio-env-variables/server.php

@@ -50,9 +50,9 @@
 logger()->info('Starting MCP Stdio Environment Variable Example Server...');
 
 Server::make()
-    ->withServerInfo('Env Var Server', '1.0.0')
-    ->withLogger(logger())
-    ->withDiscovery(__DIR__, ['.'])
+    ->setServerInfo('Env Var Server', '1.0.0')
+    ->setLogger(logger())
+    ->setDiscovery(__DIR__, ['.'])
     ->build()
     ->connect(new StdioTransport(logger: logger()));
 

examples/06-custom-dependencies-stdio/server.php

@@ -28,10 +28,10 @@
 $container->set(Services\StatsServiceInterface::class, $statsService);
 
 Server::make()
-    ->withServerInfo('Task Manager Server', '1.0.0')
-    ->withLogger(logger())
-    ->withContainer($container)
-    ->withDiscovery(__DIR__, ['.'])
+    ->setServerInfo('Task Manager Server', '1.0.0')
+    ->setLogger(logger())
+    ->setContainer($container)
+    ->setDiscovery(__DIR__, ['.'])
     ->build()
     ->connect(new StdioTransport(logger: logger()));
 

examples/07-complex-tool-schema-http/server.php

@@ -19,10 +19,10 @@
 logger()->info('Starting MCP Complex Schema HTTP Server...');
 
 Server::make()
-    ->withServerInfo('Event Scheduler Server', '1.0.0')
-    ->withLogger(logger())
-    ->withContainer(container())
-    ->withDiscovery(__DIR__, ['.'])
+    ->setServerInfo('Event Scheduler Server', '1.0.0')
+    ->setLogger(logger())
+    ->setContainer(container())
+    ->setDiscovery(__DIR__, ['.'])
     ->build()
     ->connect(new HttpServerTransport('127.0.0.1', 8082, 'mcp_scheduler'));