Skip to content

Commit

Permalink
Merge branch '6.0' into 6.1
Browse files Browse the repository at this point in the history
* 6.0:
  Fix CS
  Fix CS
  • Loading branch information
fabpot committed Jul 20, 2022
2 parents 41f6225 + 498f452 commit e16ffa5
Show file tree
Hide file tree
Showing 8 changed files with 163 additions and 163 deletions.
12 changes: 6 additions & 6 deletions Tests/Extension/AbstractBootstrap3HorizontalLayoutTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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]"]
'
Expand All @@ -38,7 +38,7 @@ public function testLabelDoesNotRenderFieldAttributes()
]);

$this->assertMatchesXpath($html,
'/label
'/label
[@for="name"]
[@class="col-sm-2 control-label required"]
'
Expand All @@ -55,7 +55,7 @@ public function testLabelWithCustomAttributesPassedDirectly()
]);

$this->assertMatchesXpath($html,
'/label
'/label
[@for="name"]
[@class="my&class col-sm-2 control-label required"]
'
Expand All @@ -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]"]
Expand All @@ -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]"]
Expand Down Expand Up @@ -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"]
Expand Down

0 comments on commit e16ffa5

Please sign in to comment.