Merge branch '6.1' into 6.2

nicolas-grekas · nicolas-grekas · commit c192eeb76af8 · 2022-08-31T10:58:08.000+02:00
* 6.1:
  [HttpKernel] fix merge
  [FrameworkBundle] fix test
diff --git a/Tests/Kernel/MicroKernelTraitTest.php b/Tests/Kernel/MicroKernelTraitTest.php
@@ -111,7 +111,7 @@ public function testSecretLoadedFromExtension()
 
     public function testAnonymousMicroKernel()
     {
-        $kernel = new class('anonymous_kernel') extends MinimalKernel {
+        $kernel = $this->kernel = new class('anonymous_kernel') extends MinimalKernel {
             public function helloAction(): Response
             {
                 return new Response('Hello World!');

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public function testSecretLoadedFromExtension()`
`111`	`111`
`112`	`112`	`public function testAnonymousMicroKernel()`
`113`	`113`	`{`
`114`		`- $kernel = new class('anonymous_kernel') extends MinimalKernel {`
	`114`	`+ $kernel = $this->kernel = new class('anonymous_kernel') extends MinimalKernel {`
`115`	`115`	`public function helloAction(): Response`
`116`	`116`	`{`
`117`	`117`	`return new Response('Hello World!');`