feat: drop support for php < 8.1,

drop support for symfony < 5.4,
php-http · Jan 23, 2024 · a606bb3 · a606bb3
1 parent 9d01ac4
commit a606bb3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,3 @@
 /vendor/
 
 .phpunit.result.cache
-.phpunit.cache
diff --git a/composer.json b/composer.json
@@ -20,7 +20,6 @@
         "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0"
     },
     "require-dev": {
-        "doctrine/instantiator": "^2.0",
         "guzzlehttp/psr7": "^2.6",
         "nyholm/psr7": "^1.8",
         "phpspec/phpspec": "^7.5",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -3,7 +3,6 @@
          bootstrap="./vendor/autoload.php"
          colors="true"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         cacheDirectory=".phpunit.cache"
 >
 
   <testsuites>

diff --git a/spec/Plugin/ContentTypePluginSpec.php b/spec/Plugin/ContentTypePluginSpec.php
@@ -22,7 +22,7 @@ public function it_is_a_plugin()
     public function it_adds_json_content_type_header(RequestInterface $request)
     {
         $request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false);
-        $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for(json_encode(['foo' => 'bar'])));
+        $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor(json_encode(['foo' => 'bar'])));
         $request->withHeader('Content-Type', 'application/json')->shouldBeCalled()->willReturn($request);
 
         $this->handleRequest($request, PluginStub::next(), function () {});
@@ -31,7 +31,7 @@ public function it_adds_json_content_type_header(RequestInterface $request)
     public function it_adds_xml_content_type_header(RequestInterface $request)
     {
         $request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false);
-        $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('<foo>bar</foo>'));
+        $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor()('<foo>bar</foo>'));
         $request->withHeader('Content-Type', 'application/xml')->shouldBeCalled()->willReturn($request);
 
         $this->handleRequest($request, PluginStub::next(), function () {});
@@ -40,7 +40,7 @@ public function it_adds_xml_content_type_header(RequestInterface $request)
     public function it_does_not_set_content_type_header(RequestInterface $request)
     {
         $request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false);
-        $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('foo'));
+        $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor()('foo'));
         $request->withHeader('Content-Type', null)->shouldNotBeCalled();
 
         $this->handleRequest($request, PluginStub::next(), function () {});
@@ -49,7 +49,7 @@ public function it_does_not_set_content_type_header(RequestInterface $request)
     public function it_does_not_set_content_type_header_if_already_one(RequestInterface $request)
     {
         $request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(true);
-        $request->getBody()->shouldNotBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('foo'));
+        $request->getBody()->shouldNotBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor()('foo'));
         $request->withHeader('Content-Type', null)->shouldNotBeCalled();
 
         $this->handleRequest($request, PluginStub::next(), function () {});
@@ -58,7 +58,7 @@ public function it_does_not_set_content_type_header_if_already_one(RequestInterf
     public function it_does_not_set_content_type_header_if_size_0_or_unknown(RequestInterface $request)
     {
         $request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false);
-        $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for());
+        $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor());
         $request->withHeader('Content-Type', null)->shouldNotBeCalled();
 
         $this->handleRequest($request, PluginStub::next(), function () {});
@@ -71,7 +71,7 @@ public function it_adds_xml_content_type_header_if_size_limit_is_not_reached_usi
         ]);
 
         $request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false);
-        $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('<foo>bar</foo>'));
+        $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor()('<foo>bar</foo>'));
         $request->withHeader('Content-Type', 'application/xml')->shouldBeCalled()->willReturn($request);
 
         $this->handleRequest($request, PluginStub::next(), function () {});
@@ -85,7 +85,7 @@ public function it_adds_xml_content_type_header_if_size_limit_is_not_reached(Req
         ]);
 
         $request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false);
-        $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('<foo>bar</foo>'));
+        $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor()('<foo>bar</foo>'));
         $request->withHeader('Content-Type', 'application/xml')->shouldBeCalled()->willReturn($request);
 
         $this->handleRequest($request, PluginStub::next(), function () {});
@@ -99,7 +99,7 @@ public function it_does_not_set_content_type_header_if_size_limit_is_reached(Req
         ]);
 
         $request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false);
-        $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('<foo>bar</foo>'));
+        $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor()('<foo>bar</foo>'));
         $request->withHeader('Content-Type', null)->shouldNotBeCalled();
 
         $this->handleRequest($request, PluginStub::next(), function () {});

diff --git a/tests/HttpMethodsClientTest.php b/tests/HttpMethodsClientTest.php
@@ -5,6 +5,7 @@
 use Http\Client\Common\HttpMethodsClient;
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Nyholm\Psr7\Response;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestInterface;
@@ -16,15 +17,9 @@ class HttpMethodsClientTest extends TestCase
     private const HEADER_VALUE = 'text/plain';
     private const BODY = 'body';
 
-    /**
-     * @var ClientInterface
-     */
-    private $httpClient;
+    private ClientInterface|MockObject $httpClient;
 
-    /**
-     * @var HttpMethodsClient
-     */
-    private $httpMethodsClient;
+    private HttpMethodsClient $httpMethodsClient;
 
     protected function setUp(): void
     {