add missing tests

Author: marcod85

src/Context.php

@@ -7,8 +7,8 @@
 final class Context
 {
     public function __construct(
-        public readonly ?ServerRequestInterface $request,
-        public readonly SessionInterface $session
+        public readonly SessionInterface $session,
+        public readonly ?ServerRequestInterface $request = null,
     )
     {
     }

src/Elements/RegisteredElement.php

@@ -31,7 +31,7 @@ public function __construct(
         $this->isManual = $isManual;
     }
 
-    public function handle(ContainerInterface $container, array $arguments, ?Context $requestContext = null): mixed
+    public function handle(ContainerInterface $container, array $arguments, Context $requestContext): mixed
     {
         if (is_string($this->handler)) {
             if (class_exists($this->handler) && method_exists($this->handler, '__invoke')) {
@@ -67,7 +67,7 @@ public function handle(ContainerInterface $container, array $arguments, ?Context
     }
 
 
-    protected function prepareArguments(\ReflectionFunctionAbstract $reflection, array $arguments, ?Context $requestContext): array
+    protected function prepareArguments(\ReflectionFunctionAbstract $reflection, array $arguments, Context $requestContext): array
     {
         $finalArgs = [];
 
@@ -77,7 +77,7 @@ protected function prepareArguments(\ReflectionFunctionAbstract $reflection, arr
             $paramType = $parameter->getType();
             $paramPosition = $parameter->getPosition();
 
-            if ($paramType?->getName() === Context::class) {
+            if ($paramType instanceof ReflectionNamedType && $paramType->getName() === Context::class) {
                 $finalArgs[$paramPosition] = $requestContext;
 
                 continue;

src/Protocol.php

@@ -141,8 +141,8 @@ public function processMessage(Request|Notification|BatchRequest $message, strin
         }
 
         $requestContext = new Context(
-            $context['request'] ?? null,
             $session,
+            $context['request'] ?? null,
         );
 
         $response = null;

tests/Fixtures/General/VariousTypesHandler.php

@@ -2,6 +2,7 @@
 
 namespace PhpMcp\Server\Tests\Fixtures\General;
 
+use PhpMcp\Server\Context;
 use PhpMcp\Server\Tests\Fixtures\Enums\BackedIntEnum;
 use PhpMcp\Server\Tests\Fixtures\Enums\BackedStringEnum;
 use PhpMcp\Server\Tests\Fixtures\Enums\UnitEnum;
@@ -142,4 +143,11 @@ public function comprehensiveArgumentTest(
     public function methodCausesTypeError(int $mustBeInt): void
     {
     }
+
+    public function contextArg(Context $context): array {
+        return [
+            'session' => $context->session->get('testKey'),
+            'request' => $context->request->getHeaderLine('testHeader'),
+        ];
+    }
 }

tests/Fixtures/Utils/SchemaGeneratorFixture.php

@@ -3,6 +3,7 @@
 namespace PhpMcp\Server\Tests\Fixtures\Utils;
 
 use PhpMcp\Server\Attributes\Schema;
+use PhpMcp\Server\Context;
 use PhpMcp\Server\Tests\Fixtures\Enums\BackedIntEnum;
 use PhpMcp\Server\Tests\Fixtures\Enums\BackedStringEnum;
 use PhpMcp\Server\Tests\Fixtures\Enums\UnitEnum;
@@ -47,6 +48,10 @@ public function typeHintsWithDocBlock(string $email, int $score, bool $verified)
     {
     }
 
+    public function contextParameter(Context $context): void
+    {
+    }
+
     // ===== METHOD-LEVEL SCHEMA SCENARIOS =====
 
     /**

tests/Integration/SchemaGenerationTest.php

@@ -58,6 +58,16 @@
     expect($schema['required'])->toEqualCanonicalizing(['email', 'score', 'verified']);
 });
 
+it('ignores Context parameter for schema', function () {
+    $method = new ReflectionMethod(SchemaGeneratorFixture::class, 'contextParameter');
+    $schema = $this->schemaGenerator->generate($method);
+
+    expect($schema)->toEqual([
+        'type' => 'object',
+        'properties' => new stdClass()
+    ]);
+});
+
 it('uses the complete schema definition provided by a method-level #[Schema(definition: ...)] attribute', function () {
     $method = new ReflectionMethod(SchemaGeneratorFixture::class, 'methodLevelCompleteDefinition');
     $schema = $this->schemaGenerator->generate($method);

tests/Unit/DispatcherTest.php

@@ -2,7 +2,6 @@
 
 namespace PhpMcp\Server\Tests\Unit;
 
-use Grpc\Call;
 use Mockery;
 use Mockery\MockInterface;
 use PhpMcp\Schema\ClientCapabilities;
@@ -73,6 +72,7 @@
     $this->session = Mockery::mock(SessionInterface::class);
     /** @var MockInterface&ContainerInterface $container */
     $this->container = Mockery::mock(ContainerInterface::class);
+    $this->context = new Context(Mockery::mock(SessionInterface::class));
 
     $configuration = new Configuration(
         serverInfo: Implementation::make('DispatcherTestServer', '1.0'),
@@ -106,21 +106,21 @@
     $this->session->shouldReceive('set')->with('client_info', Mockery::on(fn($value) => $value['name'] === 'client' && $value['version'] === '1.0'))->once();
     $this->session->shouldReceive('set')->with('protocol_version', Protocol::LATEST_PROTOCOL_VERSION)->once();
 
-    $result = $this->dispatcher->handleRequest($request, $this->session, new Context(null, Mockery::mock(SessionInterface::class)));
+    $result = $this->dispatcher->handleRequest($request, $this->session, $this->context);
     expect($result)->toBeInstanceOf(InitializeResult::class);
     expect($result->protocolVersion)->toBe(Protocol::LATEST_PROTOCOL_VERSION);
     expect($result->serverInfo->name)->toBe('DispatcherTestServer');
 });
 
 it('routes to handlePing for ping request', function () {
     $request = new JsonRpcRequest('2.0', 'id1', 'ping', []);
-    $result = $this->dispatcher->handleRequest($request, $this->session, new Context(null, Mockery::mock(SessionInterface::class)));
+    $result = $this->dispatcher->handleRequest($request, $this->session, $this->context);
     expect($result)->toBeInstanceOf(EmptyResult::class);
 });
 
 it('throws MethodNotFound for unknown request method', function () {
     $rawRequest = new JsonRpcRequest('2.0', 'id1', 'unknown/method', []);
-    $this->dispatcher->handleRequest($rawRequest, $this->session, new Context(null, Mockery::mock(SessionInterface::class)));
+    $this->dispatcher->handleRequest($rawRequest, $this->session, $this->context);
 })->throws(McpServerException::class, "Method 'unknown/method' not found.");
 
 it('routes to handleNotificationInitialized for initialized notification', function () {
@@ -202,14 +202,13 @@
     $args = ['a' => 10, 'b' => 5];
     $toolSchema = ToolSchema::make($toolName, ['type' => 'object', 'properties' => ['a' => ['type' => 'integer'], 'b' => ['type' => 'integer']]]);
     $registeredToolMock = Mockery::mock(RegisteredTool::class, [$toolSchema, 'MyToolHandler', 'handleTool', false]);
-    $context = new Context(null, Mockery::mock(SessionInterface::class));
 
     $this->registry->shouldReceive('getTool')->with($toolName)->andReturn($registeredToolMock);
     $this->schemaValidator->shouldReceive('validateAgainstJsonSchema')->with($args, $toolSchema->inputSchema)->andReturn([]); // No validation errors
-    $registeredToolMock->shouldReceive('call')->with($this->container, $args, $context)->andReturn([TextContent::make("Result: 15")]);
+    $registeredToolMock->shouldReceive('call')->with($this->container, $args, $this->context)->andReturn([TextContent::make("Result: 15")]);
 
     $request = CallToolRequest::make(1, $toolName, $args);
-    $result = $this->dispatcher->handleToolCall($request, $context);
+    $result = $this->dispatcher->handleToolCall($request, $this->context);
 
     expect($result)->toBeInstanceOf(CallToolResult::class);
     expect($result->content[0]->text)->toBe("Result: 15");
@@ -219,7 +218,7 @@
 it('can handle tool call request and throw exception if tool not found', function () {
     $this->registry->shouldReceive('getTool')->with('unknown-tool')->andReturn(null);
     $request = CallToolRequest::make(1, 'unknown-tool', []);
-    $this->dispatcher->handleToolCall($request, new Context(null, Mockery::mock(SessionInterface::class)));
+    $this->dispatcher->handleToolCall($request, $this->context);
 })->throws(McpServerException::class, "Tool 'unknown-tool' not found.");
 
 it('can handle tool call request and throw exception if argument validation fails', function () {
@@ -234,7 +233,7 @@
 
     $request = CallToolRequest::make(1, $toolName, $args);
     try {
-        $this->dispatcher->handleToolCall($request, new Context(null, Mockery::mock(SessionInterface::class)));
+        $this->dispatcher->handleToolCall($request, $this->context);
     } catch (McpServerException $e) {
         expect($e->getMessage())->toContain("Invalid parameters for tool 'strict-tool'");
         expect($e->getData()['validation_errors'])->toBeArray();
@@ -251,7 +250,7 @@
     $registeredToolMock->shouldReceive('call')->andThrow(new \RuntimeException("Tool crashed!"));
 
     $request = CallToolRequest::make(1, $toolName, []);
-    $result = $this->dispatcher->handleToolCall($request, new Context(null, Mockery::mock(SessionInterface::class)));
+    $result = $this->dispatcher->handleToolCall($request, $this->context);
 
     expect($result->isError)->toBeTrue();
     expect($result->content[0]->text)->toBe("Tool execution failed: Tool crashed!");
@@ -268,13 +267,12 @@
 
 
     $request = CallToolRequest::make(1, $toolName, []);
-    $result = $this->dispatcher->handleToolCall($request, new Context(null, Mockery::mock(SessionInterface::class)));
+    $result = $this->dispatcher->handleToolCall($request, $this->context);
 
     expect($result->isError)->toBeTrue();
     expect($result->content[0]->text)->toBe("Failed to serialize tool result: Unencodable.");
 });
 
-
 it('can handle resources list request and return paginated resources', function () {
     $resourceSchemas = [
         ResourceSchema::make('res://1', 'Resource1'),
@@ -338,10 +336,10 @@
     $resourceContents = [TextContent::make('File content')];
 
     $this->registry->shouldReceive('getResource')->with($uri)->andReturn($registeredResourceMock);
-    $registeredResourceMock->shouldReceive('read')->with($this->container, $uri)->andReturn($resourceContents);
+    $registeredResourceMock->shouldReceive('read')->with($this->container, $uri, $this->context)->andReturn($resourceContents);
 
     $request = ReadResourceRequest::make(1, $uri);
-    $result = $this->dispatcher->handleResourceRead($request);
+    $result = $this->dispatcher->handleResourceRead($request, $this->context);
 
     expect($result)->toBeInstanceOf(ReadResourceResult::class);
     expect($result->contents)->toEqual($resourceContents);
@@ -350,7 +348,7 @@
 it('can handle resource read request and throw exception if resource not found', function () {
     $this->registry->shouldReceive('getResource')->with('unknown://uri')->andReturn(null);
     $request = ReadResourceRequest::make(1, 'unknown://uri');
-    $this->dispatcher->handleResourceRead($request);
+    $this->dispatcher->handleResourceRead($request, $this->context);
 })->throws(McpServerException::class, "Resource URI 'unknown://uri' not found.");
 
 it('can handle resource subscribe request and call subscription manager', function () {
@@ -396,10 +394,10 @@
     $promptMessages = [PromptMessage::make(Role::User, TextContent::make("Summary for 2024-07-16"))];
 
     $this->registry->shouldReceive('getPrompt')->with($promptName)->andReturn($registeredPromptMock);
-    $registeredPromptMock->shouldReceive('get')->with($this->container, $args)->andReturn($promptMessages);
+    $registeredPromptMock->shouldReceive('get')->with($this->container, $args, $this->context)->andReturn($promptMessages);
 
     $request = GetPromptRequest::make(1, $promptName, $args);
-    $result = $this->dispatcher->handlePromptGet($request, $this->session);
+    $result = $this->dispatcher->handlePromptGet($request, $this->context);
 
     expect($result)->toBeInstanceOf(GetPromptResult::class);
     expect($result->messages)->toEqual($promptMessages);
@@ -413,7 +411,7 @@
     $this->registry->shouldReceive('getPrompt')->with($promptName)->andReturn($registeredPromptMock);
 
     $request = GetPromptRequest::make(1, $promptName, ['other_arg' => 'value']); // 'topic' is missing
-    $this->dispatcher->handlePromptGet($request, $this->session);
+    $this->dispatcher->handlePromptGet($request, $this->context);
 })->throws(McpServerException::class, "Missing required argument 'topic' for prompt 'needs-topic'.");