Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

[PsrHttpMessageBridge] Remove ArgumentValueResolverInterface from PsrServerRequestResolver#51167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletionsUPGRADE-6.4.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,11 @@ MonologBridge

* Add native return type to `Logger::clear()` and to `DebugProcessor::clear()`

PsrHttpMessageBridge
--------------------

* Remove `ArgumentValueResolverInterface` from `PsrServerRequestResolver`

Routing
-------

Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,8 +16,7 @@
use Psr\Http\Message\ServerRequestInterface;
use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
use Symfony\Component\HttpKernel\Controller\ValueResolverInterface as BaseValueResolverInterface;
use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;

/**
Expand All@@ -26,28 +25,17 @@
* @author Iltar van der Berg <kjarli@gmail.com>
* @author Alexander M. Turek <me@derrabus.de>
*/
final class PsrServerRequestResolver implementsArgumentValueResolverInterface,ValueResolverInterface
final class PsrServerRequestResolver implements ValueResolverInterface
{
private const SUPPORTED_TYPES = [
ServerRequestInterface::class => true,
RequestInterface::class => true,
MessageInterface::class => true,
];

private $httpMessageFactory;

public function __construct(HttpMessageFactoryInterface $httpMessageFactory)
{
$this->httpMessageFactory = $httpMessageFactory;
}

public function supports(Request $request, ArgumentMetadata $argument): bool
{
if ($this instanceof BaseValueResolverInterface) {
trigger_deprecation('symfony/psr-http-message-bridge', '2.3', 'Method "%s" is deprecated, call "resolve()" without calling "supports()" first.', __METHOD__);
}

return self::SUPPORTED_TYPES[$argument->getType()] ?? false;
public function __construct(
private readonly HttpMessageFactoryInterface $httpMessageFactory,
) {
}

public function resolve(Request $request, ArgumentMetadata $argument): \Traversable
Expand Down
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletionssrc/Symfony/Bridge/PsrHttpMessage/CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ CHANGELOG
---

* Import the bridge into the Symfony monorepo and synchronize releases
* Remove `ArgumentValueResolverInterface` from `PsrServerRequestResolver`

2.3.1
-----
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,21 +15,16 @@
use Psr\Http\Message\MessageInterface;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ServerRequestInterface;
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
use Symfony\Bridge\PsrHttpMessage\ArgumentValueResolver\PsrServerRequestResolver;
use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;

/**
* @author Alexander M. Turek <me@derrabus.de>
*/
final class PsrServerRequestResolverTest extends TestCase
{
use ExpectDeprecationTrait;

public function testServerRequest()
{
$symfonyRequest = $this->createMock(Request::class);
Expand DownExpand Up@@ -60,21 +55,6 @@ public function testMessage()
self::assertSame([$psrRequest], $resolver->getArguments($symfonyRequest, static function (MessageInterface $request): void {}));
}

/**
* @group legacy
*/
public function testDeprecatedSupports()
{
if (!interface_exists(ValueResolverInterface::class)) {
$this->markTestSkipped('Requires symfony/http-kernel 6.2.');
}

$resolver = new PsrServerRequestResolver($this->createStub(HttpMessageFactoryInterface::class));

$this->expectDeprecation('Since symfony/psr-http-message-bridge 2.3: Method "Symfony\Bridge\PsrHttpMessage\ArgumentValueResolver\PsrServerRequestResolver::supports" is deprecated, call "resolve()" without calling "supports()" first.');
$resolver->supports($this->createStub(Request::class), $this->createStub(ArgumentMetadata::class));
}

private function bootstrapResolver(Request $symfonyRequest, ServerRequestInterface $psrRequest): ArgumentResolver
{
$messageFactory = $this->createMock(HttpMessageFactoryInterface::class);
Expand Down
16 changes: 9 additions & 7 deletionssrc/Symfony/Bridge/PsrHttpMessage/composer.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,17 +18,19 @@
"require": {
"php": ">=8.1",
"psr/http-message": "^1.0|^2.0",
"symfony/deprecation-contracts": "^2.5|^3.0",
"symfony/http-foundation": "^5.4|^6.0"
},
"require-dev": {
"symfony/browser-kit": "^5.4|^6.0",
"symfony/config": "^5.4|^6.0",
"symfony/event-dispatcher": "^5.4|^6.0",
"symfony/framework-bundle": "^5.4|^6.0",
"symfony/http-kernel": "^5.4|^6.0",
"symfony/browser-kit": "^5.4|^6.0|^7.0",
"symfony/config": "^5.4|^6.0|^7.0",
"symfony/event-dispatcher": "^5.4|^6.0|^7.0",
"symfony/framework-bundle": "^6.2|^7.0",
"symfony/http-kernel": "^6.2|^7.0",
"nyholm/psr7": "^1.1",
"psr/log": "^1.1|^2|^3"
"psr/log": "^1.1.4|^2|^3"
},
"conflict": {
"symfony/http-kernel": "<6.2"
},
"suggest": {
"nyholm/psr7": "For a super lightweight PSR-7/17 implementation"
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp