From a606bb35dcb2796d1fce4a7f9e3107be763ef275 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Tue, 23 Jan 2024 09:24:00 +0100 Subject: [PATCH] feat: drop support for php < 8.1, drop support for symfony < 5.4, --- .gitignore | 1 - composer.json | 1 - phpunit.xml.dist | 1 - spec/Plugin/ContentTypePluginSpec.php | 16 ++++++++-------- tests/HttpMethodsClientTest.php | 11 +++-------- 5 files changed, 11 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 43e2342..5874147 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,3 @@ /vendor/ .phpunit.result.cache -.phpunit.cache diff --git a/composer.json b/composer.json index c83e883..128fe97 100644 --- 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 index 9ab0545..743d0ba 100644 --- 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" > diff --git a/spec/Plugin/ContentTypePluginSpec.php b/spec/Plugin/ContentTypePluginSpec.php index a27d32a..79a0b43 100644 --- 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('bar')); + $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor()('bar')); $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('bar')); + $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor()('bar')); $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('bar')); + $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor()('bar')); $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('bar')); + $request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor()('bar')); $request->withHeader('Content-Type', null)->shouldNotBeCalled(); $this->handleRequest($request, PluginStub::next(), function () {}); diff --git a/tests/HttpMethodsClientTest.php b/tests/HttpMethodsClientTest.php index 4ec9f69..aff9707 100644 --- 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 {