Skip to content

Commit 3384b2d

Browse files
minor symfony#27784 [Form] Fix fixtures for forward compat (ogizanagi)
This PR was merged into the 3.4 branch. Discussion ---------- [Form] Fix fixtures for forward compat | Q | A | ------------- | --- | Branch? | 3.4 <!-- see below --> | Bug fix? | no | New feature? | no <!-- don't forget to update src/**/CHANGELOG.md files --> | BC breaks? | no <!-- see https://symfony.com/bc --> | Deprecations? | no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tests pass? | yes <!-- please add some, will be required by reviewers --> | Fixed tickets | https://travis-ci.org/symfony/symfony/jobs/398533738#L4394-L4407 <!-- #-prefixed issue number(s), if any --> | License | MIT | Doc PR | N/A Completes symfony#27771 in order to fix https://travis-ci.org/symfony/symfony/jobs/398533738#L4394-L4407. As the Closure signature is variable, we cannot assume the exact number of whitespaces after it, nor if it will or not overtake the length of the `file:` line. So let's just assume an undetermined nb of whitespaces. Commits ------- 582d797 [Form] Fix fixtures for forward compat
2 parents 9074a6d + 582d797 commit 3384b2d

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt

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

src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ Symfony\Component\Form\Tests\Console\Descriptor\FooType (empty_data)
88
Default Value: null %s
99
%s
1010
Closure(s): [ %s
11-
Closure%s{ %s
11+
Closure%s{%w
1212
parameters: 1 %s
13-
file: "%s%eExtension%eCore%eType%eFormType.php"
13+
file: "%s%eExtension%eCore%eType%eFormType.php"%w
1414
line: "%s to %s" %s
1515
}, %s
16-
Closure%s{ %s
16+
Closure%s{%w
1717
parameters: 2 %s
18-
file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php"
18+
file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php"%w
1919
line: "%s to %s" %s
2020
} %s
2121
] %s

src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt

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

0 commit comments

Comments
 (0)