Skip to content

Commit cfa1511

Browse files
Merge branch '3.3' into 3.4
* 3.3: [WebProfilerBundle] add missing tests Fix dump panel hidden when closing a dump FormInterface::getPropertyPath(): PropertyPathInterface|null [FrameworkBundle][Routing] Remove unused logger argument
2 parents ae45fce + deeb3fd commit cfa1511

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

FormInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public function getName();
171171
/**
172172
* Returns the property path that the form is mapped to.
173173
*
174-
* @return \Symfony\Component\PropertyAccess\PropertyPathInterface The property path
174+
* @return \Symfony\Component\PropertyAccess\PropertyPathInterface|null The property path
175175
*/
176176
public function getPropertyPath();
177177

Tests/Fixtures/Descriptor/default_option_with_normalizer.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Symfony\Component\Form\Extension\Core\Type\ChoiceType (choice_translation_domain
1616
Allowed values - %s
1717
---------------- --------------------%s
1818
Normalizer Closure { %s
19-
parameters: 2, %s
20-
file: "%s%eExtension%eCore%eType%eChoiceType.php",
19+
parameters: 2 %s
20+
file: "%s%eExtension%eCore%eType%eChoiceType.php"
2121
line: "%s to %s" %s
2222
} %s
2323
---------------- --------------------%s

Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ Symfony\Component\Form\Tests\Console\Descriptor\FooType (empty_data)
99
%s
1010
Closure(s): [ %s
1111
Closure { %s
12-
parameters: 1, %s
13-
file: "%s%eExtension%eCore%eType%eFormType.php",
12+
parameters: 1 %s
13+
file: "%s%eExtension%eCore%eType%eFormType.php"
1414
line: "%s to %s" %s
1515
}, %s
1616
Closure { %s
17-
parameters: 2, %s
18-
file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php",
17+
parameters: 2 %s
18+
file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php"
1919
line: "%s to %s" %s
2020
} %s
2121
] %s

Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Symfony\Component\Form\Tests\Console\Descriptor\FooType (foo)
1717
] %s
1818
---------------- --------------------%s
1919
Normalizer Closure { %s
20-
parameters: 2, %s
21-
file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php",
20+
parameters: 2 %s
21+
file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php"
2222
line: "%s to %s" %s
2323
} %s
2424
---------------- --------------------%s

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"symfony/http-kernel": "^3.3.5|~4.0",
3333
"symfony/security-csrf": "~2.8|~3.0|~4.0",
3434
"symfony/translation": "~2.8|~3.0|~4.0",
35-
"symfony/var-dumper": "~3.3|~4.0",
35+
"symfony/var-dumper": "^3.3.11|~4.0",
3636
"symfony/console": "~3.4|~4.0"
3737
},
3838
"conflict": {

0 commit comments

Comments
 (0)