8000 Merge branch '7.0' into 7.1 · symfony/framework-bundle@6986f45 · GitHub
[go: up one dir, main page]

Skip to content

Commit 6986f45

Browse files
Merge branch '7.0' into 7.1
* 7.0: Fix merge Sync .github/expected-missing-return-types.diff
2 parents 14562c0 + 9d62f5c commit 6986f45

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

Tests/DependencyInjection/ConfigurationTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,7 @@ public function testSerializerJsonDetailedErrorMessagesEnabledWhenDefaultContext
573573
$processor = new Processor();
574574
$config = $processor->processConfiguration(new Configuration(true), [
575575
[
576+
'http_method_override' => false,
576577
'serializer' => [
577578
'default_context' => [
578579
'foo' => 'bar',
@@ -589,6 +590,7 @@ public function testSerializerJsonDetailedErrorMessagesInDefaultContextCanBeDisa
589590
$processor = new Processor();
590591
$config = $processor->processConfiguration(new Configuration(true), [
591592
[
593+
'http_method_override' => false,
592594
'serializer' => [
593595
'default_context' => [
594596
'foo' => 'bar',
@@ -606,6 +608,7 @@ public function testSerializerJsonDetailedErrorMessagesInDefaultContextCanBeDisa
606608
$processor = new Processor();
607609
$config = $processor->processConfiguration(new Configuration(true), [
608610
[
611+
'http_method_override' => false,
609612
'serializer' => [
610613
'default_context' => [
611614
'foo' => 'bar',

0 commit comments

Comments
 (0)
0