[Form] Fix merge

Author: nicolas-grekas

Tests/AbstractBootstrap3LayoutTest.php

@@ -668,7 +668,7 @@ public function testSingleChoiceExpandedWithoutTranslation()
             [@class="radio"]
             [
                 ./label
-                    [.="Choice&A"]
+                    [.=" Choice&A"]
                     [
                         ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
                     ]
@@ -677,7 +677,7 @@ public function testSingleChoiceExpandedWithoutTranslation()
             [@class="radio"]
             [
                 ./label
-                    [.="Choice&B"]
+                    [.=" Choice&B"]
                     [
                         ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
                     ]
@@ -706,7 +706,7 @@ public function testSingleChoiceExpandedAttributes()
             [@class="radio"]
             [
                 ./label
-                    [.="[trans]Choice&A[/trans]"]
+                    [.=" [trans]Choice&A[/trans]"]
                     [
                         ./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
                     ]
@@ -715,7 +715,7 @@ public function testSingleChoiceExpandedAttributes()
             [@class="radio"]
             [
                 ./label
-                    [.="[trans]Choice&B[/trans]"]
+                    [.=" [trans]Choice&B[/trans]"]
                     [
                         ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]'.$classPart.'
                     ]
@@ -868,7 +868,7 @@ public function testMultipleChoiceExpandedWithoutTranslation()
             [@class="checkbox"]
             [
                 ./label
-                    [.="Choice&A"]
+                    [.=" Choice&A"]
                     [
                         ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)]
                     ]
@@ -877,7 +877,7 @@ public function testMultipleChoiceExpandedWithoutTranslation()
             [@class="checkbox"]
             [
                 ./label
-                    [.="Choice&B"]
+                    [.=" Choice&B"]
                     [
                         ./input[@type="checkbox"][@name="name[]"][@id="name_1"][not(@checked)][not(@required)]
                     ]
@@ -886,7 +886,7 @@ public function testMultipleChoiceExpandedWithoutTranslation()
             [@class="checkbox"]
             [
                 ./label
-                    [.="Choice&C"]
+                    [.=" Choice&C"]
                     [
                         ./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
                     ]
@@ -916,7 +916,7 @@ public function testMultipleChoiceExpandedAttributes()
             [@class="checkbox"]
             [
                 ./label
-                    [.="[trans]Choice&A[/trans]"]
+                    [.=" [trans]Choice&A[/trans]"]
                     [
                         ./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)]
                     ]
@@ -925,7 +925,7 @@ public function testMultipleChoiceExpandedAttributes()
             [@class="checkbox"]
             [
                 ./label
-                    [.="[trans]Choice&B[/trans]"]
+                    [.=" [trans]Choice&B[/trans]"]
                     [
                         ./input[@type="checkbox"][@name="name[]"][@id="name_1"][not(@checked)][not(@required)]'.$classPart.'
                     ]
@@ -934,7 +934,7 @@ public function testMultipleChoiceExpandedAttributes()
             [@class="checkbox"]
             [
                 ./label
-                    [.="[trans]Choice&C[/trans]"]
+                    [.=" [trans]Choice&C[/trans]"]
                     [
                         ./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
                     ]