Skip to content

Commit 432f5cc

Browse files
dbudbu
authored
Merge pull request #83 from php-http/php-8.2
upgrade phpspec to return correct types from test doubles
2 parents db31039 + bab07a5 commit 432f5cc

File tree

7 files changed

+59
-42
lines changed

7 files changed

+59
-42
lines changed

‎.github/workflows/static.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717

1818
- name: PHPStan
1919
uses: docker://oskarstark/phpstan-ga

‎.github/workflows/tests.yml‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
php: ['7.1', '7.2', '7.3', '7.4', '8.0']
15+
php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
1616

1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v3
2020

2121
- name: Setup PHP
2222
uses: shivammathur/setup-php@v2
@@ -25,15 +25,8 @@ jobs:
2525
tools: composer:v2
2626
coverage: none
2727

28-
- name: Install PHP 7 dependencies
28+
- name: Install PHP dependencies
2929
run: composer update --prefer-dist --no-interaction --no-progress
30-
if: "matrix.php != '8.0'"
31-
32-
- name: Install PHP 8 dependencies
33-
run: |
34-
composer require "phpdocumentor/reflection-docblock:^5.2@dev" --no-interaction --no-update
35-
composer update --prefer-dist --prefer-stable --no-interaction --no-progress --ignore-platform-req=php
36-
if: "matrix.php == '8.0'"
3730

3831
- name: Execute tests
3932
run: composer test
@@ -43,11 +36,11 @@ jobs:
4336
runs-on: ubuntu-latest
4437
strategy:
4538
matrix:
46-
php: ['7.1', '7.2', '7.3', '7.4']
39+
php: ['7.1', '7.4', '8.0']
4740

4841
steps:
4942
- name: Checkout code
50-
uses: actions/checkout@v2
43+
uses: actions/checkout@v3
5144

5245
- name: Setup PHP
5346
uses: shivammathur/setup-php@v2
@@ -70,7 +63,7 @@ jobs:
7063

7164
steps:
7265
- name: Checkout code
73-
uses: actions/checkout@v2
66+
uses: actions/checkout@v3
7467

7568
- name: Setup PHP
7669
uses: shivammathur/setup-php@v2

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Change Log
22

3+
## 1.7.6 - 2023-04-23
4+
5+
- Test with PHP 8.1 and 8.2
6+
- Made phpspec tests compatible with PSR-7 2.0 strict typing
7+
38
## 1.7.5 - 2022-01-18
49

510
- Allow installation with psr/cache 3.0 (1.0 and 2.0 are still allowed too)

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"symfony/options-resolver": "^2.6 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
1919
},
2020
"require-dev": {
21-
"phpspec/phpspec": "^5.1 || ^6.0"
21+
"phpspec/phpspec": "^5.1 || ^6.0 || ^7.0"
2222
},
2323
"autoload": {
2424
"psr-4": {

‎spec/Cache/Generator/HeaderCacheKeyGeneratorSpec.php‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
use PhpSpec\ObjectBehavior;
66
use Psr\Http\Message\RequestInterface;
77
use Psr\Http\Message\StreamInterface;
8+
use Http\Client\Common\Plugin\Cache\Generator\HeaderCacheKeyGenerator;
9+
use Http\Client\Common\Plugin\Cache\Generator\CacheKeyGenerator;
10+
use Psr\Http\Message\UriInterface;
811

912
class HeaderCacheKeyGeneratorSpec extends ObjectBehavior
1013
{
@@ -15,18 +18,20 @@ public function let()
1518

1619
public function it_is_initializable()
1720
{
18-
$this->shouldHaveType('Http\Client\Common\Plugin\Cache\Generator\HeaderCacheKeyGenerator');
21+
$this->shouldHaveType(HeaderCacheKeyGenerator::class);
1922
}
2023

2124
public function it_is_a_key_generator()
2225
{
23-
$this->shouldImplement('Http\Client\Common\Plugin\Cache\Generator\CacheKeyGenerator');
26+
$this->shouldImplement(CacheKeyGenerator::class);
2427
}
2528

26-
public function it_generates_cache_from_request(RequestInterface $request, StreamInterface $body)
29+
public function it_generates_cache_from_request(RequestInterface $request, UriInterface $uri, StreamInterface $body)
2730
{
31+
$uri->__toString()->shouldBeCalled()->willReturn('http://example.com/foo');
32+
2833
$request->getMethod()->shouldBeCalled()->willReturn('GET');
29-
$request->getUri()->shouldBeCalled()->willReturn('http://example.com/foo');
34+
$request->getUri()->shouldBeCalled()->willReturn($uri);
3035
$request->getHeaderLine('Authorization')->shouldBeCalled()->willReturn('bar');
3136
$request->getHeaderLine('Content-Type')->shouldBeCalled()->willReturn('application/baz');
3237
$request->getBody()->shouldBeCalled()->willReturn($body);

‎spec/Cache/Generator/SimpleGeneratorSpec.php‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,41 @@
44

55
use PhpSpec\ObjectBehavior;
66
use Psr\Http\Message\RequestInterface;
7+
use Http\Client\Common\Plugin\Cache\Generator\CacheKeyGenerator;
8+
use Http\Client\Common\Plugin\Cache\Generator\SimpleGenerator;
9+
use Psr\Http\Message\StreamInterface;
10+
use Psr\Http\Message\UriInterface;
711

812
class SimpleGeneratorSpec extends ObjectBehavior
913
{
1014
public function it_is_initializable()
1115
{
12-
$this->shouldHaveType('Http\Client\Common\Plugin\Cache\Generator\SimpleGenerator');
16+
$this->shouldHaveType(SimpleGenerator::class);
1317
}
1418

1519
public function it_is_a_key_generator()
1620
{
17-
$this->shouldImplement('Http\Client\Common\Plugin\Cache\Generator\CacheKeyGenerator');
21+
$this->shouldImplement(CacheKeyGenerator::class);
1822
}
1923

20-
public function it_generates_cache_from_request(RequestInterface $request)
24+
public function it_generates_cache_from_request(RequestInterface $request, UriInterface $uri, StreamInterface $body)
2125
{
26+
$uri->__toString()->shouldBeCalled()->willReturn('http://example.com/foo');
27+
$body->__toString()->shouldBeCalled()->willReturn('bar');
2228
$request->getMethod()->shouldBeCalled()->willReturn('GET');
23-
$request->getUri()->shouldBeCalled()->willReturn('http://example.com/foo');
24-
$request->getBody()->shouldBeCalled()->willReturn('bar');
29+
$request->getUri()->shouldBeCalled()->willReturn($uri);
30+
$request->getBody()->shouldBeCalled()->willReturn($body);
2531

2632
$this->generate($request)->shouldReturn('GET http://example.com/foo bar');
2733
}
2834

29-
public function it_generates_cache_from_request_with_no_body(RequestInterface $request)
35+
public function it_generates_cache_from_request_with_no_body(RequestInterface $request, UriInterface $uri, StreamInterface $body)
3036
{
37+
$uri->__toString()->shouldBeCalled()->willReturn('http://example.com/foo');
38+
$body->__toString()->shouldBeCalled()->willReturn('');
3139
$request->getMethod()->shouldBeCalled()->willReturn('GET');
32-
$request->getUri()->shouldBeCalled()->willReturn('http://example.com/foo');
33-
$request->getBody()->shouldBeCalled()->willReturn('');
40+
$request->getUri()->shouldBeCalled()->willReturn($uri);
41+
$request->getBody()->shouldBeCalled()->willReturn($body);
3442

3543
// No extra space after uri
3644
$this->generate($request)->shouldReturn('GET http://example.com/foo');

‎spec/CachePluginSpec.php‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
use Psr\Http\Message\ResponseInterface;
1414
use Psr\Http\Message\StreamInterface;
1515
use Psr\Http\Message\UriInterface;
16+
use Http\Client\Common\Plugin\CachePlugin;
17+
use Http\Client\Common\Plugin;
1618

1719
class CachePluginSpec extends ObjectBehavior
1820
{
@@ -26,12 +28,12 @@ function let(CacheItemPoolInterface $pool, StreamFactory $streamFactory)
2628

2729
function it_is_initializable(CacheItemPoolInterface $pool)
2830
{
29-
$this->shouldHaveType('Http\Client\Common\Plugin\CachePlugin');
31+
$this->shouldHaveType(CachePlugin::class);
3032
}
3133

3234
function it_is_a_plugin()
3335
{
34-
$this->shouldImplement('Http\Client\Common\Plugin');
36+
$this->shouldImplement(Plugin::class);
3537
}
3638

3739
function it_caches_responses(CacheItemPoolInterface $pool, CacheItemInterface $item, RequestInterface $request, UriInterface $uri, ResponseInterface $response, StreamInterface $stream)
@@ -44,7 +46,7 @@ function it_caches_responses(CacheItemPoolInterface $pool, CacheItemInterface $i
4446
$request->getMethod()->willReturn('GET');
4547
$request->getUri()->willReturn($uri);
4648
$uri->__toString()->willReturn('https://example.com/');
47-
$request->getBody()->shouldBeCalled();
49+
$request->getBody()->shouldBeCalled()->willReturn($stream);
4850

4951
$response->getStatusCode()->willReturn(200);
5052
$response->getBody()->willReturn($stream);
@@ -72,12 +74,13 @@ function it_caches_responses(CacheItemPoolInterface $pool, CacheItemInterface $i
7274
$this->handleRequest($request, $next, function () {});
7375
}
7476

75-
function it_doesnt_store_failed_responses(CacheItemPoolInterface $pool, CacheItemInterface $item, RequestInterface $request, UriInterface $uri, ResponseInterface $response)
77+
function it_doesnt_store_failed_responses(CacheItemPoolInterface $pool, CacheItemInterface $item, RequestInterface $request, UriInterface $uri, StreamInterface $requestBody, ResponseInterface $response)
7678
{
7779
$request->getMethod()->willReturn('GET');
7880
$request->getUri()->willReturn($uri);
7981
$uri->__toString()->willReturn('https://example.com/');
80-
$request->getBody()->shouldBeCalled();
82+
$request->getBody()->shouldBeCalled()->willReturn($requestBody);
83+
$requestBody->__toString()->shouldBeCalled()->willReturn('body');
8184

8285
$response->getStatusCode()->willReturn(400);
8386
$response->getHeader('Cache-Control')->willReturn([]);
@@ -187,7 +190,7 @@ function it_calculate_age_from_response(CacheItemPoolInterface $pool, CacheItemI
187190
$request->getMethod()->willReturn('GET');
188191
$request->getUri()->willReturn($uri);
189192
$uri->__toString()->willReturn('https://example.com/');
190-
$request->getBody()->shouldBeCalled();
193+
$request->getBody()->shouldBeCalled()->willReturn($stream);
191194

192195
$response->getStatusCode()->willReturn(200);
193196
$response->getBody()->willReturn($stream);
@@ -223,7 +226,7 @@ function it_saves_etag(CacheItemPoolInterface $pool, CacheItemInterface $item, R
223226
$stream->__toString()->willReturn($httpBody);
224227
$stream->isSeekable()->willReturn(true);
225228
$stream->rewind()->shouldBeCalled();
226-
$request->getBody()->shouldBeCalled();
229+
$request->getBody()->shouldBeCalled()->willReturn($stream);
227230

228231
$request->getMethod()->willReturn('GET');
229232
$request->getUri()->willReturn($uri);
@@ -261,7 +264,8 @@ function it_adds_etag_and_modfied_since_to_request(CacheItemPoolInterface $pool,
261264
$request->getMethod()->willReturn('GET');
262265
$request->getUri()->willReturn($uri);
263266
$uri->__toString()->willReturn('https://example.com/');
264-
$request->getBody()->shouldBeCalled();
267+
$request->getBody()->shouldBeCalled()->willReturn($stream);
268+
$stream->__toString()->shouldBeCalled()->willReturn('');
265269

266270
$request->withHeader('If-Modified-Since', 'Thursday, 01-Jan-70 01:18:31 GMT')->shouldBeCalled()->willReturn($request);
267271
$request->withHeader('If-None-Match', 'foo_etag')->shouldBeCalled()->willReturn($request);
@@ -285,14 +289,15 @@ function it_adds_etag_and_modfied_since_to_request(CacheItemPoolInterface $pool,
285289
$this->handleRequest($request, $next, function () {});
286290
}
287291

288-
function it_servces_a_cached_response(CacheItemPoolInterface $pool, CacheItemInterface $item, RequestInterface $request, UriInterface $uri, ResponseInterface $response, StreamInterface $stream, StreamFactory $streamFactory)
292+
function it_serves_a_cached_response(CacheItemPoolInterface $pool, CacheItemInterface $item, RequestInterface $request, UriInterface $uri, StreamInterface $requestBody, ResponseInterface $response, StreamInterface $stream, StreamFactory $streamFactory)
289293
{
290294
$httpBody = 'body';
291295

292296
$request->getMethod()->willReturn('GET');
293297
$request->getUri()->willReturn($uri);
294298
$uri->__toString()->willReturn('https://example.com/');
295-
$request->getBody()->shouldBeCalled();
299+
$request->getBody()->shouldBeCalled()->willReturn($requestBody);
300+
$requestBody->__toString()->shouldBeCalled()->willReturn('');
296301

297302
$pool->getItem(Argument::any())->shouldBeCalled()->willReturn($item);
298303
$item->isHit()->willReturn(true);
@@ -315,14 +320,15 @@ function it_servces_a_cached_response(CacheItemPoolInterface $pool, CacheItemInt
315320
$this->handleRequest($request, $next, function () {});
316321
}
317322

318-
function it_serves_and_resaved_expired_response(CacheItemPoolInterface $pool, CacheItemInterface $item, RequestInterface $request, UriInterface $uri, ResponseInterface $response, StreamInterface $stream, StreamFactory $streamFactory)
323+
function it_serves_and_resaved_expired_response(CacheItemPoolInterface $pool, CacheItemInterface $item, RequestInterface $request, UriInterface $uri, StreamInterface $requestStream, ResponseInterface $response, StreamInterface $stream, StreamFactory $streamFactory)
319324
{
320325
$httpBody = 'body';
321326

322327
$request->getMethod()->willReturn('GET');
323328
$request->getUri()->willReturn($uri);
324329
$uri->__toString()->willReturn('https://example.com/');
325-
$request->getBody()->shouldBeCalled();
330+
$request->getBody()->shouldBeCalled()->willReturn($requestStream);
331+
$requestStream->__toString()->willReturn('');
326332

327333
$request->withHeader(Argument::any(), Argument::any())->willReturn($request);
328334
$request->withHeader(Argument::any(), Argument::any())->willReturn($request);
@@ -385,7 +391,7 @@ function it_caches_private_responses_when_allowed(
385391
$request->getMethod()->willReturn('GET');
386392
$request->getUri()->willReturn($uri);
387393
$uri->__toString()->willReturn('https://example.com/');
388-
$request->getBody()->shouldBeCalled();
394+
$request->getBody()->shouldBeCalled()->willReturn($stream);
389395

390396
$response->getStatusCode()->willReturn(200);
391397
$response->getBody()->willReturn($stream);
@@ -435,7 +441,7 @@ function it_does_not_store_responses_of_requests_to_blacklisted_paths(
435441
$request->getMethod()->willReturn('GET');
436442
$request->getUri()->willReturn($uri);
437443
$uri->__toString()->willReturn('https://example.com/foo');
438-
$request->getBody()->shouldBeCalled();
444+
$request->getBody()->shouldBeCalled()->willReturn($stream);
439445

440446
$response->getStatusCode()->willReturn(200);
441447
$response->getBody()->willReturn($stream);
@@ -482,7 +488,7 @@ function it_stores_responses_of_requests_not_in_blacklisted_paths(
482488
$request->getMethod()->willReturn('GET');
483489
$request->getUri()->willReturn($uri);
484490
$uri->__toString()->willReturn('https://example.com/');
485-
$request->getBody()->shouldBeCalled();
491+
$request->getBody()->shouldBeCalled()->willReturn($stream);
486492

487493
$response->getStatusCode()->willReturn(200);
488494
$response->getBody()->willReturn($stream);

0 commit comments

Comments
 (0)