8000 Merge branch '5.4' into 6.2 · symfony/symfony@18e6e34 · GitHub
[go: up one dir, main page]
Skip to content

Commit 18e6e34

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.4' into 6.2
* 5.4: Fix test
2 parents 2d8b401 + 7d987b7 commit 18e6e34

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/serializer_mapping_without_annotations.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

33
$container->loadFromExtension('framework', [
4+
'http_method_override' => false,
45
'serializer' => [
56
'enable_annotations' => false,
67
'mapping' => [

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/serializer_mapping_without_annotations.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xmlns:framework="http://symfony.com/schema/dic/symfony">
66

7-
<framework:config>
7+
<framework:config http-method-override="false">
88
<framework:serializer enable-annotations="false">
99
<framework:mapping>
1010
<framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files</framework:path>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/serializer_mapping_without_annotations.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
framework:
2+
http_method_override: false
23
serializer:
34
enable_annotations: false
45
mapping:

0 commit comments

Comments
 (0)
0