Merge branch '6.1' into 6.2

nicolas-grekas · nicolas-grekas · commit 683eeb389067 · 2022-08-31T10:58:08.000+02:00
* 6.1:
  [HttpKernel] fix merge
  [FrameworkBundle] fix test
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/MicroKernelTraitTest.php b/src/Symfony/Bundle/FrameworkBundle/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!');
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php
@@ -65,7 +65,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
         if (null !== $format) {
             $date = $class::createFromFormat($format, $value);
 
-            if ($class::getLastErrors()['warning_count']) {
+            if (($class::getLastErrors() ?: ['warning_count' => 0])['warning_count']) {
                 $date = false;
             }
         } else {

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!');`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): array`
`65`	`65`	`if (null !== $format) {`
`66`	`66`	`$date = $class::createFromFormat($format, $value);`
`67`	`67`
`68`		`- if ($class::getLastErrors()['warning_count']) {`
	`68`	`+ if (($class::getLastErrors() ?: ['warning_count' => 0])['warning_count']) {`
`69`	`69`	`$date = false;`
`70`	`70`	`}`
`71`	`71`	`} else {`