Skip to content

Commit 6d96513

Browse files
NyholmNyholm
committed
fix tests and style
1 parent e396044 commit 6d96513

File tree

5 files changed

+33
-28
lines changed

5 files changed

+33
-28
lines changed

‎src/Server/Builder.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ public function build(): Server
497497
new Handler\Request\ListToolsHandler($registry, $this->paginationLimit),
498498
new Handler\Request\PingHandler(),
499499
new Handler\Request\ReadResourceHandler($registry, $referenceHandler, $logger),
500-
new Handler\Request\SetLogLevelHandler($logger),
500+
new Handler\Request\SetLogLevelHandler(),
501501
]);
502502

503503
$notificationHandlers = array_merge($this->notificationHandlers, [

‎src/Server/Handler/Request/SetLogLevelHandler.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
* Handles client requests to set the logging level for the server.
2525
* The server should send all logs at this level and higher (more severe) to the client.
2626
*
27+
* @implements RequestHandlerInterface<EmptyResult>
28+
*
2729
* @author Adam Jamiu <jamiuadam120@gmail.com>
2830
*/
2931
final class SetLogLevelHandler implements RequestHandlerInterface
@@ -33,6 +35,9 @@ public function supports(Request $request): bool
3335
return $request instanceof SetLogLevelRequest;
3436
}
3537

38+
/**
39+
* @return Response<EmptyResult>
40+
*/
3641
public function handle(Request $request, SessionInterface $session): Response
3742
{
3843
\assert($request instanceof SetLogLevelRequest);

‎tests/Unit/Server/Handler/Request/CallToolHandlerTest.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function testHandleSuccessfulToolCall(): void
7171
$this->referenceHandler
7272
->expects($this->once())
7373
->method('handle')
74-
->with($toolReference, ['name' => 'John', '_session' => $this->session])
74+
->with($toolReference, ['name' => 'John', '_session' => $this->session, '_request' => $request])
7575
->willReturn('Hello, John!');
7676

7777
$toolReference
@@ -104,7 +104,7 @@ public function testHandleToolCallWithEmptyArguments(): void
104104
$this->referenceHandler
105105
->expects($this->once())
106106
->method('handle')
107-
->with($toolReference, ['_session' => $this->session])
107+
->with($toolReference, ['_session' => $this->session, '_request' => $request])
108108
->willReturn('Simple result');
109109

110110
$toolReference
@@ -141,7 +141,7 @@ public function testHandleToolCallWithComplexArguments(): void
141141
$this->referenceHandler
142142
->expects($this->once())
143143
->method('handle')
144-
->with($toolReference, array_merge($arguments, ['_session' => $this->session]))
144+
->with($toolReference, array_merge($arguments, ['_session' => $this->session, '_request' => $request]))
145145
->willReturn('Complex result');
146146

147147
$toolReference
@@ -192,7 +192,7 @@ public function testHandleToolCallExceptionReturnsResponseWithErrorResult(): voi
192192
$this->referenceHandler
193193
->expects($this->once())
194194
->method('handle')
195-
->with($toolReference, ['param' => 'value', '_session' => $this->session])
195+
->with($toolReference, ['param' => 'value', '_session' => $this->session, '_request' => $request])
196196
->willThrowException($exception);
197197

198198
$this->logger
@@ -227,7 +227,7 @@ public function testHandleWithNullResult(): void
227227
$this->referenceHandler
228228
->expects($this->once())
229229
->method('handle')
230-
->with($toolReference, ['_session' => $this->session])
230+
->with($toolReference, ['_session' => $this->session, '_request' => $request])
231231
->willReturn(null);
232232

233233
$toolReference
@@ -264,7 +264,7 @@ public function testHandleLogsErrorWithCorrectParameters(): void
264264
$this->referenceHandler
265265
->expects($this->once())
266266
->method('handle')
267-
->with($toolReference, ['key1' => 'value1', 'key2' => 42, '_session' => $this->session])
267+
->with($toolReference, ['key1' => 'value1', 'key2' => 42, '_session' => $this->session, '_request' => $request])
268268
->willThrowException($exception);
269269

270270
$this->logger
@@ -274,7 +274,7 @@ public function testHandleLogsErrorWithCorrectParameters(): void
274274
'Error while executing tool "test_tool": "Custom error message".',
275275
[
276276
'tool' => 'test_tool',
277-
'arguments' => ['key1' => 'value1', 'key2' => 42, '_session' => $this->session],
277+
'arguments' => ['key1' => 'value1', 'key2' => 42, '_session' => $this->session, '_request' => $request],
278278
],
279279
);
280280

@@ -307,7 +307,7 @@ public function testHandleGenericExceptionReturnsError(): void
307307
$this->referenceHandler
308308
->expects($this->once())
309309
->method('handle')
310-
->with($toolReference, ['param' => 'value', '_session' => $this->session])
310+
->with($toolReference, ['param' => 'value', '_session' => $this->session, '_request' => $request])
311311
->willThrowException($exception);
312312

313313
$response = $this->handler->handle($request, $this->session);
@@ -334,7 +334,7 @@ public function testHandleWithSpecialCharactersInToolName(): void
334334
$this->referenceHandler
335335
->expects($this->once())
336336
->method('handle')
337-
->with($toolReference, ['_session' => $this->session])
337+
->with($toolReference, ['_session' => $this->session, '_request' => $request])
338338
->willReturn('Special tool result');
339339

340340
$toolReference
@@ -369,7 +369,7 @@ public function testHandleWithSpecialCharactersInArguments(): void
369369
$this->referenceHandler
370370
->expects($this->once())
371371
->method('handle')
372-
->with($toolReference, array_merge($arguments, ['_session' => $this->session]))
372+
->with($toolReference, array_merge($arguments, ['_session' => $this->session, '_request' => $request]))
373373
->willReturn('Unicode handled');
374374

375375
$toolReference
@@ -399,7 +399,7 @@ public function testHandleReturnsStructuredContentResult(): void
399399
$this->referenceHandler
400400
->expects($this->once())
401401
->method('handle')
402-
->with($toolReference, ['query' => 'php', '_session' => $this->session])
402+
->with($toolReference, ['query' => 'php', '_session' => $this->session, '_request' => $request])
403403
->willReturn($structuredResult);
404404

405405
$toolReference
@@ -428,7 +428,7 @@ public function testHandleReturnsCallToolResult(): void
428428
$this->referenceHandler
429429
->expects($this->once())
430430
->method('handle')
431-
->with($toolReference, ['query' => 'php', '_session' => $this->session])
431+
->with($toolReference, ['query' => 'php', '_session' => $this->session, '_request' => $request])
432432
->willReturn($callToolResult);
433433

434434
$toolReference

‎tests/Unit/Server/Handler/Request/GetPromptHandlerTest.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function testHandleSuccessfulPromptGet(): void
7070
$this->referenceHandler
7171
->expects($this->once())
7272
->method('handle')
73-
->with($promptReference, ['_session' => $this->session])
73+
->with($promptReference, ['_session' => $this->session, '_request' => $request])
7474
->willReturn($expectedMessages);
7575

7676
$promptReference
@@ -112,7 +112,7 @@ public function testHandlePromptGetWithArguments(): void
112112
$this->referenceHandler
113113
->expects($this->once())
114114
->method('handle')
115-
->with($promptReference, array_merge($arguments, ['_session' => $this->session]))
115+
->with($promptReference, array_merge($arguments, ['_session' => $this->session, '_request' => $request]))
116116
->willReturn($expectedMessages);
117117

118118
$promptReference
@@ -145,7 +145,7 @@ public function testHandlePromptGetWithNullArguments(): void
145145
$this->referenceHandler
146146
->expects($this->once())
147147
->method('handle')
148-
->with($promptReference, ['_session' => $this->session])
148+
->with($promptReference, ['_session' => $this->session, '_request' => $request])
149149
->willReturn($expectedMessages);
150150

151151
$promptReference
@@ -178,7 +178,7 @@ public function testHandlePromptGetWithEmptyArguments(): void
178178
$this->referenceHandler
179179
->expects($this->once())
180180
->method('handle')
181-
->with($promptReference, ['_session' => $this->session])
181+
->with($promptReference, ['_session' => $this->session, '_request' => $request])
182182
->willReturn($expectedMessages);
183183

184184
$promptReference
@@ -213,7 +213,7 @@ public function testHandlePromptGetWithMultipleMessages(): void
213213
$this->referenceHandler
214214
->expects($this->once())
215215
->method('handle')
216-
->with($promptReference, ['_session' => $this->session])
216+
->with($promptReference, ['_session' => $this->session, '_request' => $request])
217217
->willReturn($expectedMessages);
218218

219219
$promptReference
@@ -299,7 +299,7 @@ public function testHandlePromptGetWithComplexArguments(): void
299299
$this->referenceHandler
300300
->expects($this->once())
301301
->method('handle')
302-
->with($promptReference, array_merge($arguments, ['_session' => $this->session]))
302+
->with($promptReference, array_merge($arguments, ['_session' => $this->session, '_request' => $request]))
303303
->willReturn($expectedMessages);
304304

305305
$promptReference
@@ -337,7 +337,7 @@ public function testHandlePromptGetWithSpecialCharacters(): void
337337
$this->referenceHandler
338338
->expects($this->once())
339339
->method('handle')
340-
->with($promptReference, array_merge($arguments, ['_session' => $this->session]))
340+
->with($promptReference, array_merge($arguments, ['_session' => $this->session, '_request' => $request]))
341341
->willReturn($expectedMessages);
342342

343343
$promptReference
@@ -367,7 +367,7 @@ public function testHandlePromptGetReturnsEmptyMessages(): void
367367
$this->referenceHandler
368368
->expects($this->once())
369369
->method('handle')
370-
->with($promptReference, ['_session' => $this->session])
370+
->with($promptReference, ['_session' => $this->session, '_request' => $request])
371371
->willReturn([]);
372372

373373
$promptReference
@@ -405,7 +405,7 @@ public function testHandlePromptGetWithLargeNumberOfArguments(): void
405405
$this->referenceHandler
406406
->expects($this->once())
407407
->method('handle')
408-
->with($promptReference, array_merge($arguments, ['_session' => $this->session]))
408+
->with($promptReference, array_merge($arguments, ['_session' => $this->session, '_request' => $request]))
409409
->willReturn($expectedMessages);
410410

411411
$promptReference

‎tests/Unit/Server/Handler/Request/ReadResourceHandlerTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function testHandleSuccessfulResourceRead(): void
7575
$this->referenceHandler
7676
->expects($this->once())
7777
->method('handle')
78-
->with($resourceReference, ['uri' => $uri, '_session' => $this->session])
78+
->with($resourceReference, ['uri' => $uri, '_session' => $this->session, '_request' => $request])
7979
->willReturn('test');
8080

8181
$resourceReference
@@ -115,7 +115,7 @@ public function testHandleResourceReadWithBlobContent(): void
115115
$this->referenceHandler
116116
->expects($this->once())
117117
->method('handle')
118-
->with($resourceReference, ['uri' => $uri, '_session' => $this->session])
118+
->with($resourceReference, ['uri' => $uri, '_session' => $this->session, '_request' => $request])
119119
->willReturn('fake-image-data');
120120

121121
$resourceReference
@@ -159,7 +159,7 @@ public function testHandleResourceReadWithMultipleContents(): void
159159
$this->referenceHandler
160160
->expects($this->once())
161161
->method('handle')
162-
->with($resourceReference, ['uri' => $uri, '_session' => $this->session])
162+
->with($resourceReference, ['uri' => $uri, '_session' => $this->session, '_request' => $request])
163163
->willReturn('binary-data');
164164

165165
$resourceReference
@@ -267,7 +267,7 @@ public function testHandleResourceReadWithDifferentUriSchemes(): void
267267
$this->referenceHandler
268268
->expects($this->once())
269269
->method('handle')
270-
->with($resourceReference, ['uri' => $uri, '_session' => $this->session])
270+
->with($resourceReference, ['uri' => $uri, '_session' => $this->session, '_request' => $request])
271271
->willReturn('test');
272272

273273
$resourceReference
@@ -312,7 +312,7 @@ public function testHandleResourceReadWithEmptyContent(): void
312312
$this->referenceHandler
313313
->expects($this->once())
314314
->method('handle')
315-
->with($resourceReference, ['uri' => $uri, '_session' => $this->session])
315+
->with($resourceReference, ['uri' => $uri, '_session' => $this->session, '_request' => $request])
316316
->willReturn('');
317317

318318
$resourceReference
@@ -374,7 +374,7 @@ public function testHandleResourceReadWithDifferentMimeTypes(): void
374374
$this->referenceHandler
375375
->expects($this->once())
376376
->method('handle')
377-
->with($resourceReference, ['uri' => $uri, '_session' => $this->session])
377+
->with($resourceReference, ['uri' => $uri, '_session' => $this->session, '_request' => $request])
378378
->willReturn($expectedContent);
379379

380380
$resourceReference

0 commit comments

Comments
 (0)