Merge branch '4.4' into 5.4

derrabus · derrabus · commit 5b173f04b57d · 2022-05-11T18:11:21.000+02:00
* 4.4:
  Allow ErrorHandler ^5.0 to be used in HttpKernel
  Fix typo
diff --git a/Tests/Fragment/InlineFragmentRendererTest.php b/Tests/Fragment/InlineFragmentRendererTest.php
@@ -155,7 +155,7 @@ public function testExceptionInSubRequestsDoesNotMangleOutputBuffers()
         $this->assertEquals('Foo', ob_get_clean());
     }
 
-    public function testLocaleAndFormatAreIsKeptInSubrequest()
+    public function testLocaleAndFormatAreKeptInSubrequest()
     {
         $expectedSubRequest = Request::create('/');
         $expectedSubRequest->attributes->set('_format', 'foo');

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public function testExceptionInSubRequestsDoesNotMangleOutputBuffers()`
`155`	`155`	`$this->assertEquals('Foo', ob_get_clean());`
`156`	`156`	`}`
`157`	`157`
`158`		`- public function testLocaleAndFormatAreIsKeptInSubrequest()`
	`158`	`+ public function testLocaleAndFormatAreKeptInSubrequest()`
`159`	`159`	`{`
`160`	`160`	`$expectedSubRequest = Request::create('/');`
`161`	`161`	`$expectedSubRequest->attributes->set('_format', 'foo');`