modelcontextprotocol/php-sdk
Watch
1
0
Fork
You've already forked php-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve middleware pipeline consistency (#262)

Browse source 
- Make MiddlewareRequestHandler final and use index counter instead of
  array_shift to avoid mutating internal state
- Make OAuthProxyMiddleware factory discovery consistently lazy via
  getter methods, matching httpClient and requestFactory pattern

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Christopher Hertel 2026-03-11 10:25:23 +01:00 • committed by GitHub
commit eac6f01d58
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Server/Transport/Http/Middleware/OAuthProxyMiddleware.php
View file

@ -43,8 +43,8 @@ final class OAuthProxyMiddleware implements MiddlewareInterface
private const CLIENT_SECRET_BASIC = 'client_secret_basic';
private const CLIENT_SECRET_POST = 'client_secret_post';
private ?ClientInterface $httpClient;
private ?RequestFactoryInterface $requestFactory;
private ClientInterface $httpClient;
private RequestFactoryInterface $requestFactory;
private ResponseFactoryInterface $responseFactory;
private StreamFactoryInterface $streamFactory;
@ -64,8 +64,8 @@ final class OAuthProxyMiddleware implements MiddlewareInterface
?ResponseFactoryInterface $responseFactory = null,
?StreamFactoryInterface $streamFactory = null,
) {
$this->httpClient = $httpClient;
$this->requestFactory = $requestFactory;
$this->httpClient = $httpClient ?? Psr18ClientDiscovery::find();
$this->requestFactory = $requestFactory ?? Psr17FactoryDiscovery::findRequestFactory();
$this->responseFactory = $responseFactory ?? Psr17FactoryDiscovery::findResponseFactory();
$this->streamFactory = $streamFactory ?? Psr17FactoryDiscovery::findStreamFactory();
}
@ -143,7 +143,7 @@ final class OAuthProxyMiddleware implements MiddlewareInterface
$body = http_build_query($params);
$upstreamRequest = $this->getRequestFactory()
$upstreamRequest = $this->requestFactory
->createRequest('POST', $tokenEndpoint)
->withHeader('Content-Type', 'application/x-www-form-urlencoded')
->withBody($this->streamFactory->createStream($body));
@ -153,7 +153,7 @@ final class OAuthProxyMiddleware implements MiddlewareInterface
}
try {
$upstreamResponse = $this->getHttpClient()->sendRequest($upstreamRequest);
$upstreamResponse = $this->httpClient->sendRequest($upstreamRequest);
$responseBody = $upstreamResponse->getBody()->__toString();
return $this->responseFactory
@ -260,14 +260,4 @@ final class OAuthProxyMiddleware implements MiddlewareInterface
return array_values(array_unique($normalized));
}
private function getHttpClient(): ClientInterface
{
return $this->httpClient ??= Psr18ClientDiscovery::find();
}
private function getRequestFactory(): RequestFactoryInterface
{
return $this->requestFactory ??= Psr17FactoryDiscovery::findRequestFactory();
}
}