Merge branch '7.1' into 7.2

* 7.1:
  Fix merge
  Sync .github/expected-missing-return-types.diff
  [ErrorHandler] Fix `E_STRICT` logging level

Author: nicolas-grekas

.github/expected-missing-return-types.diff

@@ -583,6 +583,23 @@ diff --git a/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php b/sr
 -    public function dump(Data $data);
 +    public function dump(Data $data): ?string;
  }
+diff --git a/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php b/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
+--- a/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
++++ b/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
+@@ -172,5 +172,5 @@ class ProxyHelperTest extends TestCase
+     {
+         yield 'not type hinted __unserialize method' => [new class() {
+-            public function __unserialize($array)
++            public function __unserialize($array): void
+             {
+             }
+@@ -192,5 +192,5 @@ class ProxyHelperTest extends TestCase
+ 
+         yield 'type hinted __unserialize method' => [new class() {
+-            public function __unserialize(array $array)
++            public function __unserialize(array $array): void
+             {
+             }
 diff --git a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php b/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
 --- a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
 +++ b/src/Symfony/Contracts/Translation/LocaleAwareInterface.php

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php

@@ -573,6 +573,7 @@ public function testSerializerJsonDetailedErrorMessagesEnabledWhenDefaultContext
         $processor = new Processor();
         $config = $processor->processConfiguration(new Configuration(true), [
             [
+                'http_method_override' => false,
                 'serializer' => [
                     'default_context' => [
                         'foo' => 'bar',
@@ -589,6 +590,7 @@ public function testSerializerJsonDetailedErrorMessagesInDefaultContextCanBeDisa
         $processor = new Processor();
         $config = $processor->processConfiguration(new Configuration(true), [
             [
+                'http_method_override' => false,
                 'serializer' => [
                     'default_context' => [
                         'foo' => 'bar',
@@ -606,6 +608,7 @@ public function testSerializerJsonDetailedErrorMessagesInDefaultContextCanBeDisa
         $processor = new Processor();
         $config = $processor->processConfiguration(new Configuration(true), [
             [
+                'http_method_override' => false,
                 'serializer' => [
                     'default_context' => [
                         'foo' => 'bar',

src/Symfony/Component/ErrorHandler/ErrorHandler.php

@@ -182,7 +182,7 @@ public function __construct(
     ) {
         if (\PHP_VERSION_ID < 80400) {
             $this->levels[\E_STRICT] = 'Runtime Notice';
-            $this->loggers[\E_STRICT] = [null, LogLevel::WARNING];
+            $this->loggers[\E_STRICT] = [null, LogLevel::ERROR];
         }
 
         if ($bootstrappingLogger) {