Skip to content

Commit a606bb3

Browse files
committed
feat: drop support for php < 8.1,
drop support for symfony < 5.4,
1 parent 9d01ac4 commit a606bb3

File tree

5 files changed

+11
-19
lines changed

5 files changed

+11
-19
lines changed

Diff for: .gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@
99
/vendor/
1010

1111
.phpunit.result.cache
12-
.phpunit.cache

Diff for: composer.json

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"symfony/options-resolver": "^5.4 || ^6.0 || ^7.0"
2121
},
2222
"require-dev": {
23-
"doctrine/instantiator": "^2.0",
2423
"guzzlehttp/psr7": "^2.6",
2524
"nyholm/psr7": "^1.8",
2625
"phpspec/phpspec": "^7.5",

Diff for: phpunit.xml.dist

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
bootstrap="./vendor/autoload.php"
44
colors="true"
55
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
6-
cacheDirectory=".phpunit.cache"
76
>
87

98
<testsuites>

Diff for: spec/Plugin/ContentTypePluginSpec.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function it_is_a_plugin()
2222
public function it_adds_json_content_type_header(RequestInterface $request)
2323
{
2424
$request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false);
25-
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for(json_encode(['foo' => 'bar'])));
25+
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor(json_encode(['foo' => 'bar'])));
2626
$request->withHeader('Content-Type', 'application/json')->shouldBeCalled()->willReturn($request);
2727

2828
$this->handleRequest($request, PluginStub::next(), function () {});
@@ -31,7 +31,7 @@ public function it_adds_json_content_type_header(RequestInterface $request)
3131
public function it_adds_xml_content_type_header(RequestInterface $request)
3232
{
3333
$request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false);
34-
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('<foo>bar</foo>'));
34+
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor()('<foo>bar</foo>'));
3535
$request->withHeader('Content-Type', 'application/xml')->shouldBeCalled()->willReturn($request);
3636

3737
$this->handleRequest($request, PluginStub::next(), function () {});
@@ -40,7 +40,7 @@ public function it_adds_xml_content_type_header(RequestInterface $request)
4040
public function it_does_not_set_content_type_header(RequestInterface $request)
4141
{
4242
$request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false);
43-
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('foo'));
43+
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor()('foo'));
4444
$request->withHeader('Content-Type', null)->shouldNotBeCalled();
4545

4646
$this->handleRequest($request, PluginStub::next(), function () {});
@@ -49,7 +49,7 @@ public function it_does_not_set_content_type_header(RequestInterface $request)
4949
public function it_does_not_set_content_type_header_if_already_one(RequestInterface $request)
5050
{
5151
$request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(true);
52-
$request->getBody()->shouldNotBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('foo'));
52+
$request->getBody()->shouldNotBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor()('foo'));
5353
$request->withHeader('Content-Type', null)->shouldNotBeCalled();
5454

5555
$this->handleRequest($request, PluginStub::next(), function () {});
@@ -58,7 +58,7 @@ public function it_does_not_set_content_type_header_if_already_one(RequestInterf
5858
public function it_does_not_set_content_type_header_if_size_0_or_unknown(RequestInterface $request)
5959
{
6060
$request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false);
61-
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for());
61+
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor());
6262
$request->withHeader('Content-Type', null)->shouldNotBeCalled();
6363

6464
$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
7171
]);
7272

7373
$request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false);
74-
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('<foo>bar</foo>'));
74+
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor()('<foo>bar</foo>'));
7575
$request->withHeader('Content-Type', 'application/xml')->shouldBeCalled()->willReturn($request);
7676

7777
$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
8585
]);
8686

8787
$request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false);
88-
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('<foo>bar</foo>'));
88+
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor()('<foo>bar</foo>'));
8989
$request->withHeader('Content-Type', 'application/xml')->shouldBeCalled()->willReturn($request);
9090

9191
$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
9999
]);
100100

101101
$request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false);
102-
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('<foo>bar</foo>'));
102+
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\Utils::streamFor()('<foo>bar</foo>'));
103103
$request->withHeader('Content-Type', null)->shouldNotBeCalled();
104104

105105
$this->handleRequest($request, PluginStub::next(), function () {});

Diff for: tests/HttpMethodsClientTest.php

+3-8
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Http\Client\Common\HttpMethodsClient;
66
use Nyholm\Psr7\Factory\Psr17Factory;
77
use Nyholm\Psr7\Response;
8+
use PHPUnit\Framework\MockObject\MockObject;
89
use PHPUnit\Framework\TestCase;
910
use Psr\Http\Client\ClientInterface;
1011
use Psr\Http\Message\RequestInterface;
@@ -16,15 +17,9 @@ class HttpMethodsClientTest extends TestCase
1617
private const HEADER_VALUE = 'text/plain';
1718
private const BODY = 'body';
1819

19-
/**
20-
* @var ClientInterface
21-
*/
22-
private $httpClient;
20+
private ClientInterface|MockObject $httpClient;
2321

24-
/**
25-
* @var HttpMethodsClient
26-
*/
27-
private $httpMethodsClient;
22+
private HttpMethodsClient $httpMethodsClient;
2823

2924
protected function setUp(): void
3025
{

0 commit comments

Comments
 (0)