Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit 536ca30873a8 · 2023-09-28T15:24:02.000+02:00
* 6.4:
  Fix merge
diff --git a/Tests/CacheWarmer/ConfigBuilderCacheWarmerTest.php b/Tests/CacheWarmer/ConfigBuilderCacheWarmerTest.php
@@ -67,7 +67,12 @@ public function getCacheDir(): string
             public function registerContainerConfiguration(LoaderInterface $loader): void
             {
                 $loader->load(static function (ContainerBuilder $container) {
-                    $container->loadFromExtension('framework', ['http_method_override' => false]);
+                    $container->loadFromExtension('framework', [
+                        'annotations' => false,
+                        'handle_all_throwables' => true,
+                        'http_method_override' => false,
+                        'php_errors' => ['log' => true],
+                    ]);
                 });
             }
         };

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,12 @@ public function getCacheDir(): string`
`67`	`67`	`public function registerContainerConfiguration(LoaderInterface $loader): void`
`68`	`68`	`{`
`69`	`69`	`$loader->load(static function (ContainerBuilder $container) {`
`70`		`- $container->loadFromExtension('framework', ['http_method_override' => false]);`
	`70`	`+ $container->loadFromExtension('framework', [`
	`71`	`+ 'annotations' => false,`
	`72`	`+ 'handle_all_throwables' => true,`
	`73`	`+ 'http_method_override' => false,`
	`74`	`+ 'php_errors' => ['log' => true],`
	`75`	`+ ]);`
`71`	`76`	`});`
`72`	`77`	`}`
`73`	`78`	`};`