8000 [Form] Removing self-closing slash from `<input>` · symfony/symfony@ce4e4b6 · GitHub
[go: up one dir, main page]
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

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 %}
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()
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()
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 %}
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 %}
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 %}
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
}
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
}
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
}
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()
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{% extends "base.html.twig" %}
22

33
{% block body %}
4-
Hello {{ app.user.userIdentifier }}!<br /><br />
5-
You're browsing to path "{{ app.request.pathInfo }}".<br /><br />
4+
Hello {{ app.user.userIdentifier }}!<br><br>
5+
You're browsing to path "{{ app.request.pathInfo }}".<br><br>
66
<a href="{{ logout_path('default') }}">Log out</a>.
77
<a href="{{ logout_url('default') }}">Log out</a>.
88
{% endblock %}
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{{ form_widget(form) }}
77

88
{# Note: ensure the submit name does not conflict with the form's name or it may clobber field data #}
9-
<input type="submit" name="login" />
9+
<input type="submit" name="login">
1010
</form>
1111

1212
{% endblock %}
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
<form action="{{ path('localized_check_path') }}" method="post">
1010
<label for="username">Username:</label>
11-
<input type="text" id="username" name="_username" value="{{ last_username }}" />
11+
<input type="text" id="username" name="_username" value="{{ last_username }}">
1212

1313
<label for="password">Password:</label>
14-
<input type="password" id="password" name="_password" />
14+
<input type="password" id="password" name="_password">
1515

16-
<input type="hidden" name="_target_path" value="" />
16+
<input type="hidden" name="_target_path" value="">
1717

18-
<input type="submit" name="login" />
18+
<input type="submit" name="login">
1919
</form>
2020

2121
{% endblock %}
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends "base.html.twig" %}
22

33
{% block body %}
4-
Hello {{ user.userIdentifier }}!<br /><br />
4+
Hello {{ user.userIdentifier }}!<br><br>
55
You're browsing to path "{{ app.request.pathInfo }}".
66

77
<a href="{{ logout_path('default') }}">Log out</a>.
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99

1010
<form action="{{ path('form_login_check') }}" method="post">
1111
<label for="username">Username:</label>
12-
<input type="text" id="username" name="_username" value="{{ last_username }}" />
12+
<input type="text" id="username" name="_username" value="{{ last_username }}">
1313

1414
<label for="password">Password:</label>
15-
<input type="password" id="password" name="_password" />
15+
<input type="password" id="password" name="_password">
1616

17-
<input type="hidden" name="_target_path" value="" />
17+
<input type="hidden" name="_target_path" value="">
1818

19-
<input type="submit" name="login" />
19+
<input type="submit" name="login">
2020
</form>
2121

2222
{% endblock %}
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<meta charset="{{ _charset }}" />
4+
<meta charset="{{ _charset }}">
55
<title>{% block title %}Welcome!{% endblock %}</title>
66
{% block stylesheets %}{% endblock %}
77
</head>
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@
134134
<h3 class="tab-title">Notification</h3>
135135
<div class="tab-content">
136136
<pre class="prewrap" style="max-height: 600px">
137-
{{- 'Subject: ' ~ notification.getSubject() }}<br/>
138-
{{- 'Content: ' ~ notification.getContent() }}<br/>
139-
{{- 'Importance: ' ~ notification.getImportance() }}<br/>
140-
{{- 'Emoji: ' ~ (notification.getEmoji() is empty ? '(empty)' : notification.getEmoji()) }}<br/>
141-
{{- 'Exception: ' ~ notification.getException() ?? '(empty)' }}<br/>
137+
{{- 'Subject: ' ~ notification.getSubject() }}<br>
138+
{{- 'Content: ' ~ notification.getContent() }}<br>
139+
{{- 'Importance: ' ~ notification.getImportance() }}<br>
140+
{{- 'Emoji: ' ~ (notification.getEmoji() is empty ? '(empty)' : notification.getEmoji()) }}<br>
141+
{{- 'Exception: ' ~ notification.getException() ?? '(empty)' }}<br>
142142
{{- 'ExceptionAsString: ' ~ (notification.getExceptionAsString() is empty ? '(empty)' : notification.getExceptionAsString()) }}
143143
</pre>
144144
</div>
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="{{ _charset }}" />
5-
<meta name="robots" content="noindex,nofollow" />
6-
<meta name="viewport" content="width=device-width,initial-scale=1" />
4+
<meta charset="{{ _charset }}">
5+
<meta name="robots" content="noindex,nofollow">
6+
<meta name="viewport" content="width=device-width,initial-scale=1">
77
<title>{% block title %}Symfony Profiler{% endblock %}</title>
88

99
{% set request_collector = profile is defined ? profile.collectors.request|default(null) : null %}
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="<?= $this->charset; ?>" />
5-
<meta name="robots" content="noindex,nofollow,noarchive" />
4+
<meta charset="<?= $this->charset; ?>">
5+
<meta name="robots" content="noindex,nofollow,noarchive">
66
<title>An Error Occurred: <?= $statusText; ?></title>
77
<link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>❌</text></svg>">
88
<style><?= $this->include('assets/css/error.css'); ?></style>
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!DOCTYPE html>
33
<html lang="en">
44
<head>
5-
<meta charset="<?= $this->charset; ?>" />
6-
<meta name="robots" content="noindex,nofollow" />
7-
<meta name="viewport" content="width=device-width,initial-scale=1" />
5+
<meta charset="<?= $this->charset; ?>">
6+
<meta name="robots" content="noindex,nofollow">
7+
<meta name="viewport" content="width=device-width,initial-scale=1">
88
<title><?= $_message; ?></title>
99
<link rel="icon" type="image/png" href="<?= $this->include('assets/images/favicon.png.base64'); ?>">
1010
<style><?= $this->include('assets/css/exception.css'); ?></style>
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!DOCTYPE html>
22
<html dir="ltr" lang="en">
33
<head>
4-
<meta charset="UTF-8" />
5-
<meta name="robots" content="noindex,nofollow,noarchive,nosnippet,noodp,notranslate,noimageindex" />
4+
<meta charset="UTF-8">
5+
<meta name="robots" content="noindex,nofollow,noarchive,nosnippet,noodp,notranslate,noimageindex">
66
<title>Welcome to Symfony!</title>
77
<link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>👋</text></svg>">
88
<style>