Skip to content

Commit ce4e4b6

Browse files
ThomasLandauerfabpot
ThomasLandauer
authored and
fabpot
committed
[Form] Removing self-closing slash from <input> 
1 parent 3b6d372 commit ce4e4b6

File tree

21 files changed

+47
-44
lines changed

21 files changed

+47
-44
lines changed

‎src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
{# Attribute "required" is not supported #}
1515
{%- set required = false -%}
1616
{%- endif -%}
17-
<input type="{{ type }}" {{ block('widget_attributes') }} {% if value is not empty %}value="{{ value }}" {% endif %}/>
17+
<input type="{{ type }}" {{ block('widget_attributes') }}{% if value is not empty %} value="{{ value }}"{% endif %}>
1818
{%- endblock form_widget_simple -%}
1919

2020
{%- block form_widget_compound -%}
@@ -91,11 +91,11 @@
9191
{%- endblock choice_widget_options -%}
9292

9393
{%- block checkbox_widget -%}
94-
<input type="checkbox" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
94+
<input type="checkbox" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %}>
9595
{%- endblock checkbox_widget -%}
9696

9797
{%- block radio_widget -%}
98-
<input type="radio" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
98+
<input type="radio" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %}>
9999
{%- endblock radio_widget -%}
100100

101101
{%- block datetime_widget -%}
@@ -402,7 +402,7 @@
402402
{%- endif -%}
403403
<form{% if name != '' %} name="{{ name }}"{% endif %} method="{{ form_method|lower }}"{% if action != '' %} action="{{ action }}"{% endif %}{{ block('attributes') }}{% if multipart %} enctype="multipart/form-data"{% endif %}>
404404
{%- if form_method != method -%}
405-
<input type="hidden" name="_method" value="{{ method }}" />
405+
<input type="hidden" name="_method" value="{{ method }}">
406406
{%- endif -%}
407407
{%- endblock form_start -%}
408408

@@ -440,7 +440,7 @@
440440
{%- endif -%}
441441

442442
{%- if form_method != method -%}
443-
<input type="hidden" name="_method" value="{{ method }}" />
443+
<input type="hidden" name="_method" value="{{ method }}">
444444
{%- endif -%}
445445
{% endif -%}
446446
{% endblock form_rest %}

‎src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2772,7 +2772,7 @@ public function testWidgetAttributes()
27722772
$html = $this->renderWidget($form->createView());
27732773

27742774
// compare plain HTML to check the whitespace
2775-
$this->assertSame('<input type="text" id="text" name="text" disabled="disabled" required="required" readonly="readonly" maxlength="10" pattern="\d+" class="foobar form-control" data-foo="bar" value="value" />', $html);
2775+
$this->assertSame('<input type="text" id="text" name="text" disabled="disabled" required="required" readonly="readonly" maxlength="10" pattern="\d+" class="foobar form-control" data-foo="bar" value="value">', $html);
27762776
}
27772777

27782778
public function testWidgetAttributeNameRepeatedIfTrue()
@@ -2784,7 +2784,7 @@ public function testWidgetAttributeNameRepeatedIfTrue()
27842784
$html = $this->renderWidget($form->createView());
27852785

27862786
// foo="foo"
2787-
$this->assertSame('<input type="text" id="text" name="text" required="required" foo="foo" class="form-control" value="value" />', $html);
2787+
$this->assertSame('<input type="text" id="text" name="text" required="required" foo="foo" class="form-control" value="value">', $html);
27882788
}
27892789

27902790
public function testButtonAttributes()

‎src/Symfony/Bridge/Twig/Tests/Extension/AbstractLayoutTestCase.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ protected function assertXpathNodeValue(\DOMElement $element, $expression, $node
7272
protected function assertMatchesXpath($html, $expression, $count = 1)
7373
{
7474
$dom = new \DOMDocument('UTF-8');
75+
76+
$html = preg_replace('/(<input [^>]+)(?<!\/)>/', '$1/>', $html);
77+
7578
try {
7679
// Wrap in <root> node so we can load HTML with multiple tags at
7780
// the top level
@@ -2511,7 +2514,7 @@ public function testWidgetAttributes()
25112514
$html = $this->renderWidget($form->createView());
25122515

25132516
// compare plain HTML to check the whitespace
2514-
$this->assertSame('<input type="text" id="text" name="text" disabled="disabled" required="required" readonly="readonly" maxlength="10" pattern="\d+" class="foobar" data-foo="bar" value="value" />', $html);
2517+
$this->assertSame('<input type="text" id="text" name="text" disabled="disabled" required="required" readonly="readonly" maxlength="10" pattern="\d+" class="foobar" data-foo="bar" value="value">', $html);
25152518
}
25162519

25172520
public function testWidgetAttributeNameRepeatedIfTrue()
@@ -2523,7 +2526,7 @@ public function testWidgetAttributeNameRepeatedIfTrue()
25232526
$html = $this->renderWidget($form->createView());
25242527

25252528
// foo="foo"
2526-
$this->assertSame('<input type="text" id="text" name="text" required="required" foo="foo" value="value" />', $html);
2529+
$this->assertSame('<input type="text" id="text" name="text" required="required" foo="foo" value="value">', $html);
25272530
}
25282531

25292532
public function testWidgetAttributeHiddenIfFalse()

‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{% block form_widget_simple %}
22
{%- set type = type|default('text') -%}
3-
<input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}" rel="theme" />
3+
<input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}" rel="theme">
44
{%- endblock form_widget_simple %}

‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
{% block form_widget_simple %}
44
{%- set type = type|default('text') -%}
5-
<input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}" rel="theme" />
5+
<input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}" rel="theme">
66
{%- endblock form_widget_simple %}

‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_use.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
{% block form_widget_simple %}
44
{%- set type = type|default('text') -%}
5-
<input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}" rel="theme" />
5+
<input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}" rel="theme">
66
{%- endblock form_widget_simple %}

‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function testMoneyWidgetInIso()
9797
$this->assertSame(<<<'HTML'
9898
<div class="input-group">
9999
<span class="input-group-addon">&euro; </span>
100-
<input type="text" id="name" name="name" required="required" class="form-control" /> </div>
100+
<input type="text" id="name" name="name" required="required" class="form-control"> </div>
101101
HTML
102102
, trim($this->renderWidget($view)));
103103
}

‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public function testMoneyWidgetInIso()
102102
$this->assertSame(<<<'HTML'
103103
<div class="input-group "><div class="input-group-prepend">
104104
<span class="input-group-text">&euro; </span>
105-
</div><input type="text" id="name" name="name" required="required" class="form-control" /></div>
105+
</div><input type="text" id="name" name="name" required="required" class="form-control"></div>
106106
HTML
107107
, trim($this->renderWidget($view)));
108108
}

‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5LayoutTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public function testMoneyWidgetInIso()
101101
->createView();
102102

103103
self::assertSame(<<<'HTML'
104-
<div class="input-group "><span class="input-group-text">&euro; </span><input type="text" id="name" name="name" required="required" class="form-control" /></div>
104+
<div class="input-group "><span class="input-group-text">&euro; </span><input type="text" id="name" name="name" required="required" class="form-control"></div>
105105
HTML
106106
, trim($this->renderWidget($view)));
107107
}

‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public function testMoneyWidgetInIso()
184184
->createView()
185185
;
186186

187-
$this->assertSame('&euro; <input type="text" id="name" name="name" required="required" />', $this->renderWidget($view));
187+
$this->assertSame('&euro; <input type="text" id="name" name="name" required="required">', $this->renderWidget($view));
188188
}
189189

190190
public function testHelpAttr()

0 commit comments

Comments
 (0)