Swap laminas/laminas-diactoros for guzzlehttp/psr7

amphp · Sep 4, 2024 · 6c7589a · 6c7589a
1 parent a758017
commit 6c7589a
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 100 deletions.
diff --git a/composer.json b/composer.json
@@ -44,7 +44,7 @@
         "amphp/phpunit-util": "^3",
         "amphp/php-cs-fixer-config": "^2",
         "phpunit/phpunit": "^9",
-        "laminas/laminas-diactoros": "^2.3",
+        "guzzlehttp/psr7": "^2",
         "psalm/phar": "^5"
     },
     "provide": {

diff --git a/examples/psr-with-amp.php b/examples/psr-with-amp.php
@@ -3,18 +3,17 @@
 use Amp\Http\Client\HttpClientBuilder;
 use Amp\Http\Client\Psr7\PsrAdapter;
 use Amp\Http\Client\Psr7\PsrHttpClient;
-use Laminas\Diactoros\RequestFactory;
-use Laminas\Diactoros\ResponseFactory;
+use GuzzleHttp\Psr7\HttpFactory;
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$requestFactory = new RequestFactory;
+$psrHttpFactory = new HttpFactory();
 
 $psrHttpClient = new PsrHttpClient(
     HttpClientBuilder::buildDefault(),
-    new PsrAdapter($requestFactory, new ResponseFactory)
+    new PsrAdapter($psrHttpFactory, $psrHttpFactory)
 );
 
-$psrResponse = $psrHttpClient->sendRequest($requestFactory->createRequest('GET', 'https://api.github.com/'));
+$psrResponse = $psrHttpClient->sendRequest($psrHttpFactory->createRequest('GET', 'https://api.github.com/'));
 
 print $psrResponse->getBody();
diff --git a/test/Internal/PsrInputStreamTest.php b/test/Internal/PsrInputStreamTest.php
@@ -2,7 +2,7 @@
 
 namespace Amp\Http\Client\Psr7\Internal;
 
-use Laminas\Diactoros\StreamFactory;
+use GuzzleHttp\Psr7\HttpFactory;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\StreamInterface;
 
@@ -87,7 +87,7 @@ public function testReadReturnsMatchingDataFromStream(
         string $firstChunk,
         string $secondChunk
     ): void {
-        $stream = (new StreamFactory())->createStream($sourceData);
+        $stream = (new HttpFactory())->createStream($sourceData);
 
         $inputStream = new PsrInputStream($stream, $chunkSize);
 

diff --git a/test/Internal/PsrStreamBodyTest.php b/test/Internal/PsrStreamBodyTest.php
@@ -2,7 +2,7 @@
 
 namespace Amp\Http\Client\Psr7\Internal;
 
-use Laminas\Diactoros\StreamFactory;
+use GuzzleHttp\Psr7\HttpFactory;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\StreamInterface;
 use function Amp\ByteStream\buffer;
@@ -44,7 +44,7 @@ public function testContentTypeIsNull(): void
 
     public function testCreateBodyStreamResultReadsFromOriginalStream(): void
     {
-        $stream = (new StreamFactory())->createStream('body_content');
+        $stream = (new HttpFactory())->createStream('body_content');
         $body = new PsrStreamBody($stream);
 
         self::assertSame('body_content', buffer($body->getContent()));