Skip to content

Commit e59f035

Browse files
bug symfony#58589 [FrameworkBundle] Bump symfony/http-kernel (alexandre-daubois)
This PR was merged into the 7.2 branch. Discussion ---------- [FrameworkBundle] Bump `symfony/http-kernel` | Q | A | ------------- | --- | Branch? | 7.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix symfony#58581 | License | MIT Doing something conditionally (as stated in the issue) seems tricky because we deal with env var placeholders in `FrameworkExtension`. Another solution is to provide a bug fix to 7.1 where `HttpKernel/Kernel` would check if the `kernel.trusted_headers` parameter is null then fallback on a default value, but it doesn't feel quite right to me. I think the best/cleanest solution is to simply bump the dep constraint in FWB's composer.json. `symfony/serializer` must also be bumped to `^7.1`, tests fails otherwise: https://github.com/symfony/symfony/actions/runs/11384686629/job/31672929730?pr=58589#step:8:11669 Commits ------- 7efd164 [FrameworkBundle] Bump `symfony/http-kernel`
2 parents bc9f35c + 7efd164 commit e59f035

File tree

2 files changed

+3
-29
lines changed

2 files changed

+3
-29
lines changed

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ApiAttributesTest.php

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
1313

14-
use Composer\InstalledVersions;
1514
use Symfony\Component\HttpFoundation\JsonResponse;
1615
use Symfony\Component\HttpFoundation\Request;
1716
use Symfony\Component\HttpFoundation\Response;
@@ -165,18 +164,6 @@ public static function mapQueryStringProvider(): iterable
165164
}
166165
JSON;
167166

168-
$httpKernelVersion = InstalledVersions::getVersion('symfony/http-kernel');
169-
if ($httpKernelVersion && version_compare($httpKernelVersion, '7.2.0', '<')) {
170-
$expectedResponse = <<<'JSON'
171-
{
172-
"type": "https:\/\/tools.ietf.org\/html\/rfc2616#section-10",
173-
"title": "An error occurred",
174-
"status": 404,
175-
"detail": "Not Found"
176-
}
177-
JSON;
178-
}
179-
180167
yield 'empty query string mapping non-nullable attribute without default value' => [
181168
'uri' => '/map-query-string-to-non-nullable-attribute-without-default-value.json',
182169
'query' => [],
@@ -750,19 +737,6 @@ public static function mapRequestPayloadProvider(): iterable
750737
}
751738
JSON;
752739

753-
$httpKernelVersion = InstalledVersions::getVersion('symfony/http-kernel');
754-
if ($httpKernelVersion && version_compare($httpKernelVersion, '7.2.0', '<')) {
755-
$expectedStatusCode = 422;
756-
$expectedResponse = <<<'JSON'
757-
{
758-
"type": "https:\/\/tools.ietf.org\/html\/rfc2616#section-10",
759-
"title": "An error occurred",
760-
"status": 422,
761-
"detail": "Unprocessable Content"
762-
}
763-
JSON;
764-
}
765-
766740
yield 'empty request mapping non-nullable attribute without default value' => [
767741
'uri' => '/map-request-to-non-nullable-attribute-without-default-value.json',
768742
'format' => 'json',

src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"symfony/error-handler": "^6.4|^7.0",
2727
"symfony/event-dispatcher": "^6.4|^7.0",
2828
"symfony/http-foundation": "^6.4|^7.0",
29-
"symfony/http-kernel": "^6.4|^7.0",
29+
"symfony/http-kernel": "^7.2",
3030
"symfony/polyfill-mbstring": "~1.0",
3131
"symfony/filesystem": "^7.1",
3232
"symfony/finder": "^6.4|^7.0",
@@ -59,7 +59,7 @@
5959
"symfony/scheduler": "^6.4.4|^7.0.4",
6060
"symfony/security-bundle": "^6.4|^7.0",
6161
"symfony/semaphore": "^6.4|^7.0",
62-
"symfony/serializer": "^6.4|^7.0",
62+
"symfony/serializer": "^7.1",
6363
"symfony/stopwatch": "^6.4|^7.0",
6464
"symfony/string": "^6.4|^7.0",
6565
"symfony/translation": "^6.4|^7.0",
@@ -95,9 +95,9 @@
9595
"symfony/property-access": "<6.4",
9696
"symfony/runtime": "<6.4.13|>=7.0,<7.1.6",
9797
"symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4",
98-
"symfony/serializer": "<6.4",
9998
"symfony/security-csrf": "<7.2",
10099
"symfony/security-core": "<6.4",
100+
"symfony/serializer": "<7.1",
101101
"symfony/stopwatch": "<6.4",
102102
"symfony/translation": "<6.4",
103103
"symfony/twig-bridge": "<6.4",

0 commit comments

Comments
 (0)