Skip to content

Commit 1226742

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: Add missing files from 5.3 Remove unneeded files Tweak bug report template Fix using FileLinkFormatter after serialization [Serializer] Remove DecoderInterface type hint for API Platform compatibility Prevent infinite nesting of lazy `ObjectManager` instances when `ObjectManager` is reset [DependencyInjection] Skip parameter attribute configurators in AttributeAutoconfigurationPass if we can't get the constructor reflector [HttpKernel] fix sending Vary: Accept-Language when appropriate
2 parents 4e504d1 + 93d97a1 commit 1226742

File tree

4 files changed

+13
-2
lines changed

4 files changed

+13
-2
lines changed

Debug/FileLinkFormatter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ class FileLinkFormatter
3535
];
3636

3737
private array|false $fileLinkFormat;
38-
private ?RequestStack $requestStack;
39-
private ?string $baseDir;
38+
private ?RequestStack $requestStack = null;
39+
private ?string $baseDir = null;
4040
private \Closure|string|null $urlFormat;
4141

4242
/**

EventListener/LocaleListener.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ private function setLocale(Request $request)
7070
$request->setLocale($locale);
7171
} elseif ($this->useAcceptLanguageHeader && $this->enabledLocales && ($preferredLanguage = $request->getPreferredLanguage($this->enabledLocales))) {
7272
$request->setLocale($preferredLanguage);
73+
$request->attributes->set('_vary_by_language', true);
7374
}
7475
}
7576

EventListener/ResponseListener.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ public function onKernelResponse(ResponseEvent $event)
5050

5151
if ($this->addContentLanguageHeader && !$response->isInformational() && !$response->isEmpty() && !$response->headers->has('Content-Language')) {
5252
$response->headers->set('Content-Language', $event->getRequest()->getLocale());
53+
}
54+
55+
if ($event->getRequest()->attributes->get('_vary_by_language')) {
5356
$response->setVary('Accept-Language', false);
5457
}
5558

Tests/Debug/FileLinkFormatterTest.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ public function testWhenNoFileLinkFormatAndNoRequest()
2525
$this->assertFalse($sut->format('/kernel/root/src/my/very/best/file.php', 3));
2626
}
2727

28+
public function testAfterUnserialize()
29+
{
30+
$sut = unserialize(serialize(new FileLinkFormatter()));
31+
32+
$this->assertFalse($sut->format('/kernel/root/src/my/very/best/file.php', 3));
33+
}
34+
2835
public function testWhenFileLinkFormatAndNoRequest()
2936
{
3037
$file = __DIR__.\DIRECTORY_SEPARATOR.'file.php';

0 commit comments

Comments
 (0)