[Form] Removed .form-control-label class.

vudaltsov · nicolas-grekas · commit cb3e7126987a · 2018-07-09T14:42:04.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
@@ -187,7 +187,7 @@
             {%- set element = 'legend' -%}
             {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' col-form-label')|trim}) -%}
         {%- else -%}
-            {%- set label_attr = label_attr|merge({for: id, class: (label_attr.class|default('') ~ ' form-control-label')|trim}) -%}
+            {%- set label_attr = label_attr|merge({for: id}) -%}
         {%- endif -%}
         {% if required -%}
             {% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) %}
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -23,7 +23,7 @@
         "symfony/asset": "~2.8|~3.0|~4.0",
         "symfony/dependency-injection": "~2.8|~3.0|~4.0",
         "symfony/finder": "~2.8|~3.0|~4.0",
-        "symfony/form": "^3.4.9|^4.0.9",
+        "symfony/form": "^3.4.13|~4.0.13|^4.1.2",
         "symfony/http-foundation": "^3.3.11|~4.0",
         "symfony/http-kernel": "~3.2|~4.0",
         "symfony/polyfill-intl-icu": "~1.0",
@@ -41,7 +41,7 @@
         "symfony/workflow": "~3.3|~4.0"
     },
     "conflict": {
-        "symfony/form": "<3.4.9|<4.0.9,>=4.0",
+        "symfony/form": "<3.4.13|>=4.0,<4.0.13|>=4.1,<4.1.2",
         "symfony/console": "<3.4"
     },
     "suggest": {
diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php
@@ -72,7 +72,7 @@ public function testLabelDoesNotRenderFieldAttributes()
         $this->assertMatchesXpath($html,
 '/label
     [@for="name"]
-    [@class="col-form-label col-sm-2 form-control-label required"]
+    [@class="col-form-label col-sm-2 required"]
 '
         );
     }
@@ -89,7 +89,7 @@ public function testLabelWithCustomAttributesPassedDirectly()
         $this->assertMatchesXpath($html,
 '/label
     [@for="name"]
-    [@class="my&class col-form-label col-sm-2 form-control-label required"]
+    [@class="my&class col-form-label col-sm-2 required"]
 '
         );
     }
@@ -106,7 +106,7 @@ public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
         $this->assertMatchesXpath($html,
 '/label
     [@for="name"]
-    [@class="my&class col-form-label col-sm-2 form-control-label required"]
+    [@class="my&class col-form-label col-sm-2 required"]
     [.="[trans]Custom label[/trans]"]
 '
         );
@@ -126,7 +126,7 @@ public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly
         $this->assertMatchesXpath($html,
 '/label
     [@for="name"]
-    [@class="my&class col-form-label col-sm-2 form-control-label required"]
+    [@class="my&class col-form-label col-sm-2 required"]
     [.="[trans]Custom label[/trans]"]
 '
         );
diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php
@@ -81,7 +81,7 @@ public function testLabelDoesNotRenderFieldAttributes()
         $this->assertMatchesXpath($html,
 '/label
     [@for="name"]
-    [@class="form-control-label required"]
+    [@class="required"]
 '
         );
     }
@@ -98,7 +98,7 @@ public function testLabelWithCustomAttributesPassedDirectly()
         $this->assertMatchesXpath($html,
 '/label
     [@for="name"]
-    [@class="my&class form-control-label required"]
+    [@class="my&class required"]
 '
         );
     }
@@ -115,7 +115,7 @@ public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
         $this->assertMatchesXpath($html,
 '/label
     [@for="name"]
-    [@class="my&class form-control-label required"]
+    [@class="my&class required"]
     [.="[trans]Custom label[/trans]"]
 '
         );
@@ -135,7 +135,7 @@ public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly
         $this->assertMatchesXpath($html,
 '/label
     [@for="name"]
-    [@class="my&class form-control-label required"]
+    [@class="my&class required"]
     [.="[trans]Custom label[/trans]"]
 '
         );

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function testLabelDoesNotRenderFieldAttributes()`
`72`	`72`	`$this->assertMatchesXpath($html,`
`73`	`73`	`'/label`
`74`	`74`	`[@for="name"]`
`75`		`- [@class="col-form-label col-sm-2 form-control-label required"]`
	`75`	`+ [@class="col-form-label col-sm-2 required"]`
`76`	`76`	`'`
`77`	`77`	`);`
`78`	`78`	`}`
`@@ -89,7 +89,7 @@ public function testLabelWithCustomAttributesPassedDirectly()`
`89`	`89`	`$this->assertMatchesXpath($html,`
`90`	`90`	`'/label`
`91`	`91`	`[@for="name"]`
`92`		`- [@class="my&class col-form-label col-sm-2 form-control-label required"]`
	`92`	`+ [@class="my&class col-form-label col-sm-2 required"]`
`93`	`93`	`'`
`94`	`94`	`);`
`95`	`95`	`}`
`@@ -106,7 +106,7 @@ public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()`
`106`	`106`	`$this->assertMatchesXpath($html,`
`107`	`107`	`'/label`
`108`	`108`	`[@for="name"]`
`109`		`- [@class="my&class col-form-label col-sm-2 form-control-label required"]`
	`109`	`+ [@class="my&class col-form-label col-sm-2 required"]`
`110`	`110`	`[.="[trans]Custom label[/trans]"]`
`111`	`111`	`'`
`112`	`112`	`);`
`@@ -126,7 +126,7 @@ public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly`
`126`	`126`	`$this->assertMatchesXpath($html,`
`127`	`127`	`'/label`
`128`	`128`	`[@for="name"]`
`129`		`- [@class="my&class col-form-label col-sm-2 form-control-label required"]`
	`129`	`+ [@class="my&class col-form-label col-sm-2 required"]`
`130`	`130`	`[.="[trans]Custom label[/trans]"]`
`131`	`131`	`'`
`132`	`132`	`);`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function testLabelDoesNotRenderFieldAttributes()`
`81`	`81`	`$this->assertMatchesXpath($html,`
`82`	`82`	`'/label`
`83`	`83`	`[@for="name"]`
`84`		`- [@class="form-control-label required"]`
	`84`	`+ [@class="required"]`
`85`	`85`	`'`
`86`	`86`	`);`
`87`	`87`	`}`
`@@ -98,7 +98,7 @@ public function testLabelWithCustomAttributesPassedDirectly()`
`98`	`98`	`$this->assertMatchesXpath($html,`
`99`	`99`	`'/label`
`100`	`100`	`[@for="name"]`
`101`		`- [@class="my&class form-control-label required"]`
	`101`	`+ [@class="my&class required"]`
`102`	`102`	`'`
`103`	`103`	`);`
`104`	`104`	`}`
`@@ -115,7 +115,7 @@ public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()`
`115`	`115`	`$this->assertMatchesXpath($html,`
`116`	`116`	`'/label`
`117`	`117`	`[@for="name"]`
`118`		`- [@class="my&class form-control-label required"]`
	`118`	`+ [@class="my&class required"]`
`119`	`119`	`[.="[trans]Custom label[/trans]"]`
`120`	`120`	`'`
`121`	`121`	`);`
`@@ -135,7 +135,7 @@ public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly`
`135`	`135`	`$this->assertMatchesXpath($html,`
`136`	`136`	`'/label`
`137`	`137`	`[@for="name"]`
`138`		`- [@class="my&class form-control-label required"]`
	`138`	`+ [@class="my&class required"]`
`139`	`139`	`[.="[trans]Custom label[/trans]"]`
`140`	`140`	`'`
`141`	`141`	`);`