Skip to content

Commit ae583a3

Browse files
authored
Merge pull request #39 from mezzio/renovate/psr-http-message-2.x
Update dependency psr/http-message to v2
2 parents 707780d + fb2b6c7 commit ae583a3

File tree

3 files changed

+29
-19
lines changed

3 files changed

+29
-19
lines changed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"fig/http-message-util": "^1.1.2",
4242
"psr/container": "^1.0 || ^2.0",
4343
"psr/http-factory": "^1.0",
44-
"psr/http-message": "^1.0",
44+
"psr/http-message": "^1.0 || ^2.0",
4545
"psr/http-server-middleware": "^1.0",
4646
"spatie/array-to-xml": "^2.3 || ^3.0",
4747
"webmozart/assert": "^1.10",

composer.lock

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/ProblemDetailsNotFoundHandlerTest.php

+19-9
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44

55
namespace MezzioTest\ProblemDetails;
66

7+
use Laminas\Diactoros\ServerRequest;
8+
use Laminas\Diactoros\Stream;
9+
use Laminas\Diactoros\Uri;
710
use Mezzio\ProblemDetails\ProblemDetailsNotFoundHandler;
811
use Mezzio\ProblemDetails\ProblemDetailsResponseFactory;
912
use PHPUnit\Framework\Attributes\DataProvider;
1013
use PHPUnit\Framework\MockObject\MockObject;
1114
use PHPUnit\Framework\TestCase;
1215
use Psr\Http\Message\ResponseInterface;
13-
use Psr\Http\Message\ServerRequestInterface;
1416
use Psr\Http\Server\RequestHandlerInterface;
1517

1618
class ProblemDetailsNotFoundHandlerTest extends TestCase
@@ -37,10 +39,14 @@ public static function acceptHeaders(): array
3739
#[DataProvider('acceptHeaders')]
3840
public function testResponseFactoryPassedInConstructorGeneratesTheReturnedResponse(string $acceptHeader): void
3941
{
40-
$request = $this->createMock(ServerRequestInterface::class);
41-
$request->method('getMethod')->willReturn('POST');
42-
$request->method('getHeaderLine')->with('Accept')->willReturn($acceptHeader);
43-
$request->method('getUri')->willReturn('https://example.com/foo');
42+
$request = new ServerRequest(
43+
[],
44+
[],
45+
new Uri('https://example.com/foo'),
46+
'POST',
47+
new Stream('php://memory'),
48+
['Accept' => $acceptHeader]
49+
);
4450

4551
$response = $this->createMock(ResponseInterface::class);
4652

@@ -62,10 +68,14 @@ public function testResponseFactoryPassedInConstructorGeneratesTheReturnedRespon
6268

6369
public function testHandlerIsCalledIfAcceptHeaderIsUnacceptable(): void
6470
{
65-
$request = $this->createMock(ServerRequestInterface::class);
66-
$request->method('getMethod')->willReturn('POST');
67-
$request->method('getHeaderLine')->with('Accept')->willReturn('text/html');
68-
$request->method('getUri')->willReturn('https://example.com/foo');
71+
$request = new ServerRequest(
72+
[],
73+
[],
74+
new Uri('https://example.com/foo'),
75+
'POST',
76+
new Stream('php://memory'),
77+
['Accept' => 'text/html']
78+
);
6979

7080
$response = $this->createMock(ResponseInterface::class);
7181

0 commit comments

Comments
 (0)