Skip to content

Commit 3f003d8

Browse files
TobionTobion
committed
Merge branch '2.7' into 2.8
Conflicts: src/Symfony/Component/Console/Application.php src/Symfony/Component/Console/Command/Command.php src/Symfony/Component/Console/Formatter/OutputFormatter.php src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php src/Symfony/Component/Console/Input/Input.php src/Symfony/Component/Console/Input/InputArgument.php src/Symfony/Component/Console/Input/InputDefinition.php src/Symfony/Component/Console/Input/InputOption.php src/Symfony/Component/Console/Output/OutputInterface.php src/Symfony/Component/Console/Output/StreamOutput.php src/Symfony/Component/CssSelector/CssSelector.php src/Symfony/Component/DependencyInjection/Container.php src/Symfony/Component/DependencyInjection/ContainerBuilder.php src/Symfony/Component/DependencyInjection/ContainerInterface.php src/Symfony/Component/DependencyInjection/Definition.php src/Symfony/Component/DependencyInjection/Scope.php src/Symfony/Component/DependencyInjection/ScopeInterface.php src/Symfony/Component/Validator/Constraints/Currency.php src/Symfony/Component/Validator/Constraints/CurrencyValidator.php
2 parents 5fac71e + a9e038d commit 3f003d8

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

‎Tests/AbstractBootstrap3LayoutTest.php

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public function testCheckedCheckbox()
162162
[@class="checkbox"]
163163
[
164164
./label
165-
[.="[trans]Name[/trans]"]
165+
[.=" [trans]Name[/trans]"]
166166
[
167167
./input[@type="checkbox"][@name="name"][@id="my&id"][@class="my&class"][@checked="checked"][@value="1"]
168168
]
@@ -180,7 +180,7 @@ public function testUncheckedCheckbox()
180180
[@class="checkbox"]
181181
[
182182
./label
183-
[.="[trans]Name[/trans]"]
183+
[.=" [trans]Name[/trans]"]
184184
[
185185
./input[@type="checkbox"][@name="name"][@id="my&id"][@class="my&class"][not(@checked)]
186186
]
@@ -200,7 +200,7 @@ public function testCheckboxWithValue()
200200
[@class="checkbox"]
201201
[
202202
./label
203-
[.="[trans]Name[/trans]"]
203+
[.=" [trans]Name[/trans]"]
204204
[
205205
./input[@type="checkbox"][@name="name"][@id="my&id"][@class="my&class"][@value="foo&bar"]
206206
]
@@ -632,7 +632,7 @@ public function testSingleChoiceExpanded()
632632
[@class="radio"]
633633
[
634634
./label
635-
[.="[trans]Choice&A[/trans]"]
635+
[.=" [trans]Choice&A[/trans]"]
636636
[
637637
./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
638638
]
@@ -641,7 +641,7 @@ public function testSingleChoiceExpanded()
641641
[@class="radio"]
642642
[
643643
./label
644-
[.="[trans]Choice&B[/trans]"]
644+
[.=" [trans]Choice&B[/trans]"]
645645
[
646646
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
647647
]
@@ -668,7 +668,7 @@ public function testSingleChoiceExpandedWithoutTranslation()
668668
[@class="radio"]
669669
[
670670
./label
671-
[.="Choice&A"]
671+
[.=" Choice&A"]
672672
[
673673
./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
674674
]
@@ -677,7 +677,7 @@ public function testSingleChoiceExpandedWithoutTranslation()
677677
[@class="radio"]
678678
[
679679
./label
680-
[.="Choice&B"]
680+
[.=" Choice&B"]
681681
[
682682
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
683683
]
@@ -706,7 +706,7 @@ public function testSingleChoiceExpandedAttributes()
706706
[@class="radio"]
707707
[
708708
./label
709-
[.="[trans]Choice&A[/trans]"]
709+
[.=" [trans]Choice&A[/trans]"]
710710
[
711711
./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
712712
]
@@ -715,7 +715,7 @@ public function testSingleChoiceExpandedAttributes()
715715
[@class="radio"]
716716
[
717717
./label
718-
[.="[trans]Choice&B[/trans]"]
718+
[.=" [trans]Choice&B[/trans]"]
719719
[
720720
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]'.$classPart.'
721721
]
@@ -742,7 +742,7 @@ public function testSingleChoiceExpandedWithPlaceholder()
742742
[@class="radio"]
743743
[
744744
./label
745-
[.="[trans]Test&Me[/trans]"]
745+
[.=" [trans]Test&Me[/trans]"]
746746
[
747747
./input[@type="radio"][@name="name"][@id="name_placeholder"][not(@checked)]
748748
]
@@ -751,7 +751,7 @@ public function testSingleChoiceExpandedWithPlaceholder()
751751
[@class="radio"]
752752
[
753753
./label
754-
[.="[trans]Choice&A[/trans]"]
754+
[.=" [trans]Choice&A[/trans]"]
755755
[
756756
./input[@type="radio"][@name="name"][@id="name_0"][@checked]
757757
]
@@ -760,7 +760,7 @@ public function testSingleChoiceExpandedWithPlaceholder()
760760
[@class="radio"]
761761
[
762762
./label
763-
[.="[trans]Choice&B[/trans]"]
763+
[.=" [trans]Choice&B[/trans]"]
764764
[
765765
./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
766766
]
@@ -786,7 +786,7 @@ public function testSingleChoiceExpandedWithBooleanValue()
786786
[@class="radio"]
787787
[
788788
./label
789-
[.="[trans]Choice&A[/trans]"]
789+
[.=" [trans]Choice&A[/trans]"]
790790
[
791791
./input[@type="radio"][@name="name"][@id="name_0"][@checked]
792792
]
@@ -795,7 +795,7 @@ public function testSingleChoiceExpandedWithBooleanValue()
795795
[@class="radio"]
796796
[
797797
./label
798-
[.="[trans]Choice&B[/trans]"]
798+
[.=" [trans]Choice&B[/trans]"]
799799
[
800800
./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
801801
]
@@ -822,7 +822,7 @@ public function testMultipleChoiceExpanded()
822822
[@class="checkbox"]
823823
[
824824
./label
825-
[.="[trans]Choice&A[/trans]"]
825+
[.=" [trans]Choice&A[/trans]"]
826826
[
827827
./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)]
828828
]
@@ -831,7 +831,7 @@ public function testMultipleChoiceExpanded()
831831
[@class="checkbox"]
832832
[
833833
./label
834-
[.="[trans]Choice&B[/trans]"]
834+
[.=" [trans]Choice&B[/trans]"]
835835
[
836836
./input[@type="checkbox"][@name="name[]"][@id="name_1"][not(@checked)][not(@required)]
837837
]
@@ -840,7 +840,7 @@ public function testMultipleChoiceExpanded()
840840
[@class="checkbox"]
841841
[
842842
./label
843-
[.="[trans]Choice&C[/trans]"]
843+
[.=" [trans]Choice&C[/trans]"]
844844
[
845845
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
846846
]
@@ -868,7 +868,7 @@ public function testMultipleChoiceExpandedWithoutTranslation()
868868
[@class="checkbox"]
869869
[
870870
./label
871-
[.="Choice&A"]
871+
[.=" Choice&A"]
872872
[
873873
./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)]
874874
]
@@ -877,7 +877,7 @@ public function testMultipleChoiceExpandedWithoutTranslation()
877877
[@class="checkbox"]
878878
[
879879
./label
880-
[.="Choice&B"]
880+
[.=" Choice&B"]
881881
[
882882
./input[@type="checkbox"][@name="name[]"][@id="name_1"][not(@checked)][not(@required)]
883883
]
@@ -886,7 +886,7 @@ public function testMultipleChoiceExpandedWithoutTranslation()
886886
[@class="checkbox"]
887887
[
888888
./label
889-
[.="Choice&C"]
889+
[.=" Choice&C"]
890890
[
891891
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
892892
]
@@ -916,7 +916,7 @@ public function testMultipleChoiceExpandedAttributes()
916916
[@class="checkbox"]
917917
[
918918
./label
919-
[.="[trans]Choice&A[/trans]"]
919+
[.=" [trans]Choice&A[/trans]"]
920920
[
921921
./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)]
922922
]
@@ -925,7 +925,7 @@ public function testMultipleChoiceExpandedAttributes()
925925
[@class="checkbox"]
926926
[
927927
./label
928-
[.="[trans]Choice&B[/trans]"]
928+
[.=" [trans]Choice&B[/trans]"]
929929
[
930930
./input[@type="checkbox"][@name="name[]"][@id="name_1"][not(@checked)][not(@required)]'.$classPart.'
931931
]
@@ -934,7 +934,7 @@ public function testMultipleChoiceExpandedAttributes()
934934
[@class="checkbox"]
935935
[
936936
./label
937-
[.="[trans]Choice&C[/trans]"]
937+
[.=" [trans]Choice&C[/trans]"]
938938
[
939939
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
940940
]

0 commit comments

Comments
 (0)