diff --git a/composer-require-check.json b/composer-require-check.json index 91e34a8..618f5d5 100644 --- a/composer-require-check.json +++ b/composer-require-check.json @@ -14,7 +14,17 @@ "iterable", "callable", "void", - "object" + "object", + "createHttpClientBuilder", + "Amp\\File\\File", + "Amp\\File\\FilesystemException", + "Amp\\File\\openFile", + "Amp\\Http\\Tunnel\\Http1TunnelConnector", + "Amp\\Http\\Tunnel\\Https1TunnelConnector", + "Amp\\Http\\Tunnel\\Socks5TunnelConnector", + "createHttpClientBuilder", + "Psr\\Http\\Message\\RequestFactoryInterface", + "Psr\\Http\\Message\\ResponseFactoryInterface" ], "php-core-extensions": [ "Core", @@ -23,6 +33,7 @@ "Phar", "Reflection", "SPL", - "standard" + "standard", + "json" ] } diff --git a/composer.json b/composer.json index ee4326e..e71f22d 100644 --- a/composer.json +++ b/composer.json @@ -28,8 +28,16 @@ "require": { "php": ">=8.1", "amphp/amp": "^3", + "amphp/byte-stream": "^2.1", + "amphp/dns": "^2.2", "amphp/http-client": "^5", "amphp/http-client-psr7": "^1", + "amphp/socket": "^2.3", + "guzzlehttp/guzzle": "^7.9", + "guzzlehttp/promises": "^2", + "guzzlehttp/psr7": "^2.7", + "psr/http-message": "^1.1", + "psr/http-factory-implementation": "^1", "revolt/event-loop": "^1" }, "require-dev": { @@ -37,9 +45,7 @@ "amphp/http-tunnel": "^2", "amphp/php-cs-fixer-config": "^2", "amphp/phpunit-util": "^3", - "laminas/laminas-diactoros": "^2.3", "leproxy/leproxy": "^0.2.2", - "guzzlehttp/guzzle": "^7", "phpunit/phpunit": "^9", "psalm/phar": "^5", "revolt/event-loop-adapter-react": "^1.1" diff --git a/test/GuzzleHandlerAdapterTest.php b/test/GuzzleHandlerAdapterTest.php index 9e41fb8..33fbc82 100644 --- a/test/GuzzleHandlerAdapterTest.php +++ b/test/GuzzleHandlerAdapterTest.php @@ -10,9 +10,9 @@ use GuzzleHttp\Client; use GuzzleHttp\HandlerStack; use GuzzleHttp\Promise\PromiseInterface; +use GuzzleHttp\Psr7\Request; use GuzzleHttp\RedirectMiddleware; use GuzzleHttp\RequestOptions; -use Laminas\Diactoros\Request; use LeProxy\LeProxy\LeProxyServer; use React\EventLoop\Loop; use function Amp\async; @@ -110,7 +110,7 @@ public function testApplicationInterceptorDefaults(): void public function testRequestDefaults(): void { $promise = (new GuzzleHandlerAdapter($client = $this->createMock(DelegateHttpClient::class))) - (new Request(), []); + (new Request('GET', 'https://example.com'), []); $client->method('request')->willReturnCallback( function (AmpRequest $request): never {