Merge branch 'main' into allow-runtime-tools

Author: e0ipso

.github/workflows/pipeline.yaml

@@ -72,7 +72,8 @@ jobs:
       - name: Tests
         run: vendor/bin/phpunit --testsuite=inspector
 
-  conformance:
+  conformance-server:
+    name: conformance / server
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -122,6 +123,47 @@ jobs:
         if: always()
         run: docker compose -f tests/Conformance/Fixtures/docker-compose.yml down
 
+  conformance-client:
+    name: conformance / client
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.4'
+          coverage: "none"
+
+      - name: Setup Node
+        uses: actions/setup-node@v6
+        with:
+          node-version: '22'
+
+      - name: Install Composer
+        uses: "ramsey/composer-install@v4"
+
+      - name: Create log directory
+        run: mkdir -p tests/Conformance/logs
+
+      - name: Run client conformance tests
+        working-directory: ./tests/Conformance
+        run: npx @modelcontextprotocol/conformance client --command "php ${{ github.workspace }}/tests/Conformance/client.php" --suite all --expected-failures conformance-baseline.yml
+
+      - name: Show logs on failure
+        if: failure()
+        run: |
+          echo "=== Client Conformance Log ==="
+          cat tests/Conformance/logs/client-conformance.log 2>/dev/null || echo "No client conformance log found"
+          echo ""
+          echo "=== Test Results ==="
+          find tests/Conformance/results -name "checks.json" 2>/dev/null | head -3 | while read f; do
+            echo "--- $f ---"
+            cat "$f"
+            echo ""
+          done || echo "No results found"
+
   qa:
     runs-on: ubuntu-latest
     steps:

.php-cs-fixer.dist.php

@@ -31,8 +31,6 @@
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        'protected_to_private' => false,
-        'declare_strict_types' => false,
         'header_comment' => ['header' => $fileHeader],
         'php_unit_test_case_static_method_calls' => ['call_type' => 'this'],
     ])

CHANGELOG.md

@@ -14,6 +14,10 @@ All notable changes to `mcp/sdk` will be documented in this file.
 * Add OAuth 2.0 Dynamic Client Registration middleware (RFC 7591)
 * Add optional `title` field to `Prompt` and `McpPrompt` for MCP spec compliance
 * [BC Break] `Builder::addPrompt()` signature changed — `$title` parameter added between `$name` and `$description`. Callers using positional arguments for `$description` must switch to named arguments.
+* Add optional `title` field to `Tool` and `McpTool` for MCP spec compliance
+* [BC Break] `Tool::__construct()` signature changed — `$title` parameter added between `$name` and `$inputSchema`. Callers using positional arguments must switch to named arguments or pass `null` for `$title`.
+* [BC Break] `McpTool` attribute signature changed — `$title` parameter added between `$name` and `$description`. Callers using positional arguments for `$description` must switch to named arguments.
+* [BC Break] `Builder::addTool()` signature changed — `$title` parameter added between `$name` and `$description`. Callers using positional arguments for `$description` must switch to named arguments.
 
 0.4.0
 -----

Makefile

@@ -1,4 +1,4 @@
-.PHONY: deps-stable deps-low cs phpstan tests unit-tests inspector-tests coverage ci ci-stable ci-lowest conformance-tests docs
+.PHONY: deps-stable deps-low cs phpstan tests unit-tests inspector-tests coverage ci ci-stable ci-lowest conformance-tests conformance-server conformance-client docs
 
 deps-stable:
 	composer update --prefer-stable
@@ -21,13 +21,18 @@ unit-tests:
 inspector-tests:
 	vendor/bin/phpunit --testsuite=inspector
 
-conformance-tests:
+conformance-tests: conformance-server conformance-client
+
+conformance-server:
 	docker compose -f tests/Conformance/Fixtures/docker-compose.yml up -d
 	@echo "Waiting for server to start..."
 	@sleep 5
 	cd tests/Conformance && npx @modelcontextprotocol/conformance server --url http://localhost:8000/ || true
 	docker compose -f tests/Conformance/Fixtures/docker-compose.yml down
 
+conformance-client:
+	cd tests/Conformance && npx @modelcontextprotocol/conformance client --command "php $(CURDIR)/tests/Conformance/client.php" --suite all --expected-failures conformance-baseline.yml || true
+
 coverage:
 	XDEBUG_MODE=coverage vendor/bin/phpunit --testsuite=unit --coverage-html=coverage
 

docs/server-builder.md

@@ -278,6 +278,7 @@ $server = Server::builder()
 
 - `handler` (callable|string): The tool handler
 - `name` (string|null): Optional tool name
+- `title` (string|null): Optional human-readable title for display in UI
 - `description` (string|null): Optional tool description
 - `annotations` (ToolAnnotations|null): Optional annotations for the tool
 - `inputSchema` (array|null): Optional input schema for the tool
@@ -637,7 +638,7 @@ $server = Server::builder()
 | `addRequestHandlers()` | handlers | Prepend multiple custom request handlers |
 | `addNotificationHandler()` | handler | Prepend a single custom notification handler |
 | `addNotificationHandlers()` | handlers | Prepend multiple custom notification handlers |
-| `addTool()` | handler, name?, description?, annotations?, inputSchema? | Register tool |
+| `addTool()` | handler, name?, title?, description?, annotations?, inputSchema?, ... | Register tool |
 | `addResource()` | handler, uri, name?, description?, mimeType?, size?, annotations? | Register resource |
 | `addResourceTemplate()` | handler, uriTemplate, name?, description?, mimeType?, annotations? | Register resource template |
 | `addPrompt()` | handler, name?, description? | Register prompt |

docs/server-client-communication.md

@@ -24,7 +24,7 @@ use Mcp\Server\RequestContext;
 
 class MyService
 {
-    #[McpTool('my_tool', 'My Tool Description')]
+    #[McpTool(name: 'my_tool', description: 'My Tool Description')]
     public function myTool(RequestContext $context): string
     {
         $context->getClientGateway()->log(...);

examples/client/http_client_communication.php

@@ -1,5 +1,14 @@
 <?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.
+ */
+
 /**
  * HTTP Client Communication Example.
  *
@@ -20,17 +29,6 @@
  * Eg. symfony serve --passthru=examples/server/client-communication/server.php --no-tls
  */
 
-declare(strict_types=1);
-
-/*
- * 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.
- */
-
 require_once __DIR__.'/../../vendor/autoload.php';
 
 use Mcp\Client;

examples/client/http_discovery_calculator.php

@@ -1,5 +1,14 @@
 <?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.
+ */
+
 /**
  * HTTP Client Example.
  *
@@ -12,17 +21,6 @@
  *   php -S localhost:8080 examples/server/http-discovery-calculator/server.php
  */
 
-declare(strict_types=1);
-
-/*
- * 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.
- */
-
 require_once __DIR__.'/../../vendor/autoload.php';
 
 use Mcp\Client;

examples/client/stdio_client_communication.php

@@ -1,5 +1,14 @@
 <?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.
+ */
+
 /**
  * STDIO Client Communication Example.
  *
@@ -11,17 +20,6 @@
  * Usage: php examples/client/stdio_client_communication.php
  */
 
-declare(strict_types=1);
-
-/*
- * 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.
- */
-
 require_once __DIR__.'/../../vendor/autoload.php';
 
 use Mcp\Client;

examples/client/stdio_discovery_calculator.php

@@ -1,16 +1,5 @@
 <?php
 
-/**
- * Simple STDIO Client Example.
- *
- * This example demonstrates how to use the MCP client with a STDIO transport
- * to communicate with an MCP server running as a child process.
- *
- * Usage: php examples/client/stdio_discovery_calculator.php
- */
-
-declare(strict_types=1);
-
 /*
  * This file is part of the official PHP MCP SDK.
  *
@@ -20,6 +9,15 @@
  * file that was distributed with this source code.
  */
 
+/**
+ * Simple STDIO Client Example.
+ *
+ * This example demonstrates how to use the MCP client with a STDIO transport
+ * to communicate with an MCP server running as a child process.
+ *
+ * Usage: php examples/client/stdio_discovery_calculator.php
+ */
+
 require_once __DIR__.'/../../vendor/autoload.php';
 
 use Mcp\Client;