Skip to content

Commit 0e8b927

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: fix merge [AssetMapper] Split test dirs in tests Fix typo Change incorrect check for the `stateless` request attribute [Validator] add setGroupProvider to AttributeLoader use copy() instead of rename() on Windows test: kebab-case to snake_case [PropertyInfo] Handle collection in PhpStan same as PhpDoc [Messenger] Passing to `WorkerMessageRetriedEvent` envelope with actual stamps after sent
2 parents 855dee8 + 747e72f commit 0e8b927

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/EventListener/LocaleListenerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public function testRequestNoLocaleFromAcceptLanguageHeader()
201201
$this->assertEquals('fr_FR', $request->getLocale());
202202
}
203203

204-
public function testRequestAttributeLocaleNotOverridenFromAcceptLanguageHeader()
204+
public function testRequestAttributeLocaleNotOverriddenFromAcceptLanguageHeader()
205205
{
206206
$request = Request::create('/');
207207
$request->attributes->set('_locale', 'it');

Tests/EventListener/SessionListenerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ public function testUninitializedSessionWithoutInitializedSession()
560560
$this->assertSame('60', $response->headers->getCacheControlDirective('s-maxage'));
561561
}
562562

563-
public function testResponseHeadersMaxAgeAndExpiresNotBeOverridenIfSessionStarted()
563+
public function testResponseHeadersMaxAgeAndExpiresNotBeOverriddenIfSessionStarted()
564564
{
565565
$session = $this->createMock(Session::class);
566566
$session->expects($this->once())->method('getUsageIndex')->willReturn(1);

0 commit comments

Comments
 (0)