Skip to content

Commit

Permalink
Merge pull request #39 from mezzio/renovate/psr-http-message-2.x
Browse files Browse the repository at this point in the history
Update dependency psr/http-message to v2
  • Loading branch information
gsteel authored May 30, 2023
2 parents 707780d + fb2b6c7 commit ae583a3
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 19 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"fig/http-message-util": "^1.1.2",
"psr/container": "^1.0 || ^2.0",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.0",
"psr/http-message": "^1.0 || ^2.0",
"psr/http-server-middleware": "^1.0",
"spatie/array-to-xml": "^2.3 || ^3.0",
"webmozart/assert": "^1.10",
Expand Down
18 changes: 9 additions & 9 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 19 additions & 9 deletions test/ProblemDetailsNotFoundHandlerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@

namespace MezzioTest\ProblemDetails;

use Laminas\Diactoros\ServerRequest;
use Laminas\Diactoros\Stream;
use Laminas\Diactoros\Uri;
use Mezzio\ProblemDetails\ProblemDetailsNotFoundHandler;
use Mezzio\ProblemDetails\ProblemDetailsResponseFactory;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Server\RequestHandlerInterface;

class ProblemDetailsNotFoundHandlerTest extends TestCase
Expand All @@ -37,10 +39,14 @@ public static function acceptHeaders(): array
#[DataProvider('acceptHeaders')]
public function testResponseFactoryPassedInConstructorGeneratesTheReturnedResponse(string $acceptHeader): void
{
$request = $this->createMock(ServerRequestInterface::class);
$request->method('getMethod')->willReturn('POST');
$request->method('getHeaderLine')->with('Accept')->willReturn($acceptHeader);
$request->method('getUri')->willReturn('https://example.com/foo');
$request = new ServerRequest(
[],
[],
new Uri('https://example.com/foo'),
'POST',
new Stream('php://memory'),
['Accept' => $acceptHeader]
);

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

Expand All @@ -62,10 +68,14 @@ public function testResponseFactoryPassedInConstructorGeneratesTheReturnedRespon

public function testHandlerIsCalledIfAcceptHeaderIsUnacceptable(): void
{
$request = $this->createMock(ServerRequestInterface::class);
$request->method('getMethod')->willReturn('POST');
$request->method('getHeaderLine')->with('Accept')->willReturn('text/html');
$request->method('getUri')->willReturn('https://example.com/foo');
$request = new ServerRequest(
[],
[],
new Uri('https://example.com/foo'),
'POST',
new Stream('php://memory'),
['Accept' => 'text/html']
);

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

Expand Down

0 comments on commit ae583a3

Please sign in to comment.