Skip to content

Commit b733bfe

Browse files
Merge branch '6.0' into 6.1
* 6.0: [Console] Fixes "Incorrectly nested style tag found" error when using multi-line header content Fix LDAP connection options fix probably undefined variable $expireAt Fix aliases handling in command name completion Fix division by zero Allow ErrorHandler ^5.0 to be used in HttpKernel [Security/Http] Ignore invalid URLs found in failure/success paths Fix typo
2 parents 3866b45 + 547340f commit b733bfe

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/Fragment/InlineFragmentRendererTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public function testExceptionInSubRequestsDoesNotMangleOutputBuffers()
155155
$this->assertEquals('Foo', ob_get_clean());
156156
}
157157

158-
public function testLocaleAndFormatAreIsKeptInSubrequest()
158+
public function testLocaleAndFormatAreKeptInSubrequest()
159159
{
160160
$expectedSubRequest = Request::create('/');
161161
$expectedSubRequest->attributes->set('_format', 'foo');

0 commit comments

Comments
 (0)