Merge branch '6.4' into 7.0

* 6.4:
  Fix merge (bis)

Author: nicolas-grekas

Tests/DependencyInjection/ConfigurationTest.php

@@ -573,6 +573,8 @@ public function testSerializerJsonDetailedErrorMessagesEnabledWhenDefaultContext
         $config = $processor->processConfiguration(new Configuration(true), [
             [
                 'http_method_override' => false,
+                'handle_all_throwables' => true,
+                'php_errors' => ['log' => true],
                 'serializer' => [
                     'default_context' => [
                         'foo' => 'bar',
@@ -590,6 +592,8 @@ public function testSerializerJsonDetailedErrorMessagesInDefaultContextCanBeDisa
         $config = $processor->processConfiguration(new Configuration(true), [
             [
                 'http_method_override' => false,
+                'handle_all_throwables' => true,
+                'php_errors' => ['log' => true],
                 'serializer' => [
                     'default_context' => [
                         'foo' => 'bar',
@@ -608,6 +612,8 @@ public function testSerializerJsonDetailedErrorMessagesInDefaultContextCanBeDisa
         $config = $processor->processConfiguration(new Configuration(true), [
             [
                 'http_method_override' => false,
+                'handle_all_throwables' => true,
+                'php_errors' => ['log' => true],
                 'serializer' => [
                     'default_context' => [
                         'foo' => 'bar',