Merge branch '5.4' into 6.0

* 5.4:
  Fix CS
  Fix CS

Author: fabpot

Tests/Extension/AbstractBootstrap3HorizontalLayoutTest.php

@@ -21,7 +21,7 @@ public function testLabelOnForm()
         $html = $this->renderLabel($view);
 
         $this->assertMatchesXpath($html,
-'/label
+            '/label
     [@class="col-sm-2 control-label required"]
     [.="[trans]Name[/trans]"]
 '
@@ -38,7 +38,7 @@ public function testLabelDoesNotRenderFieldAttributes()
         ]);
 
         $this->assertMatchesXpath($html,
-'/label
+            '/label
     [@for="name"]
     [@class="col-sm-2 control-label required"]
 '
@@ -55,7 +55,7 @@ public function testLabelWithCustomAttributesPassedDirectly()
         ]);
 
         $this->assertMatchesXpath($html,
-'/label
+            '/label
     [@for="name"]
     [@class="my&class col-sm-2 control-label required"]
 '
@@ -72,7 +72,7 @@ public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
         ]);
 
         $this->assertMatchesXpath($html,
-'/label
+            '/label
     [@for="name"]
     [@class="my&class col-sm-2 control-label required"]
     [.="[trans]Custom label[/trans]"]
@@ -92,7 +92,7 @@ public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly
         ]);
 
         $this->assertMatchesXpath($html,
-'/label
+            '/label
     [@for="name"]
     [@class="my&class col-sm-2 control-label required"]
     [.="[trans]Custom label[/trans]"]
@@ -203,7 +203,7 @@ public function testCheckboxRowWithHelp()
         $html = $this->renderRow($form->createView(), ['label' => 'foo', 'help' => 'really helpful text']);
 
         $this->assertMatchesXpath($html,
-'/div
+            '/div
     [@class="form-group"]
     [
         ./div[@class="col-sm-2" or @class="col-sm-10"]