Skip to content

Commit 7b80056

Browse files
committed
Merge branch '5.4' into 6.3
* 5.4: Removing self-closing slash from <input>
2 parents 2fd432f + 4eecbe9 commit 7b80056

File tree

10 files changed

+15
-15
lines changed

10 files changed

+15
-15
lines changed

components/dom_crawler.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -533,12 +533,12 @@ To work with multi-dimensional fields:
533533
.. code-block:: html
534534

535535
<form>
536-
<input name="multi[]"/>
537-
<input name="multi[]"/>
538-
<input name="multi[dimensional]"/>
539-
<input name="multi[dimensional][]" value="1"/>
540-
<input name="multi[dimensional][]" value="2"/>
541-
<input name="multi[dimensional][]" value="3"/>
536+
<input name="multi[]">
537+
<input name="multi[]">
538+
<input name="multi[dimensional]">
539+
<input name="multi[dimensional][]" value="1">
540+
<input name="multi[dimensional][]" value="2">
541+
<input name="multi[dimensional][]" value="3">
542542
</form>
543543

544544
Pass an array of values::

components/form.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ done by passing a special form "view" object to your template (notice the
509509
{{ form_start(form) }}
510510
{{ form_widget(form) }}
511511

512-
<input type="submit"/>
512+
<input type="submit">
513513
{{ form_end(form) }}
514514

515515
.. image:: /_images/form/simple-form.png

form/form_customization.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ fields, so you no longer have to deal with form themes:
117117
value="{{ field_value(form.username) }}"
118118
placeholder="{{ field_label(form.username) }}"
119119
class="form-control"
120-
/>
120+
>
121121

122122
<select name="{{ field_name(form.country) }}" class="form-control">
123123
<option value="">{{ field_label(form.country) }}</option>

form/form_themes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ upon the form themes enabled in your app):
213213

214214
.. code-block:: html
215215

216-
<input type="number" id="form_age" name="form[age]" required="required" value="33"/>
216+
<input type="number" id="form_age" name="form[age]" required="required" value="33">
217217

218218
Symfony uses a Twig block called ``integer_widget`` to render that field. This
219219
is because the field type is ``integer`` and you're rendering its ``widget`` (as

reference/constraints/File.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ You can find a list of existing mime types on the `IANA website`_.
264264

265265
When using this constraint on a :doc:`FileType field </reference/forms/types/file>`,
266266
the value of the ``mimeTypes`` option is also used in the ``accept``
267-
attribute of the related ``<input type="file"/>`` HTML element.
267+
attribute of the related ``<input type="file">`` HTML element.
268268

269269
This behavior is applied only when using :ref:`form type guessing <form-type-guessing>`
270270
(i.e. the form type is not defined explicitly in the ``->add()`` method of

reference/forms/types/email.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ EmailType Field
22
===============
33

44
The ``EmailType`` field is a text field that is rendered using the HTML5
5-
``<input type="email"/>`` tag.
5+
``<input type="email">`` tag.
66

77
+---------------------------+---------------------------------------------------------------------+
88
| Rendered as | ``input`` ``email`` field (a text box) |

reference/forms/types/range.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ RangeType Field
22
===============
33

44
The ``RangeType`` field is a slider that is rendered using the HTML5
5-
``<input type="range"/>`` tag.
5+
``<input type="range">`` tag.
66

77
+---------------------------+---------------------------------------------------------------------+
88
| Rendered as | ``input`` ``range`` field (slider in HTML5 supported browser) |

reference/forms/types/search.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SearchType Field
22
================
33

4-
This renders an ``<input type="search"/>`` field, which is a text box with
4+
This renders an ``<input type="search">`` field, which is a text box with
55
special functionality supported by some browsers.
66

77
Read about the input search field at `DiveIntoHTML5.info`_

security/csrf.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ generate a CSRF token in the template and store it as a hidden form field:
141141

142142
<form action="{{ url('admin_post_delete', { id: post.id }) }}" method="post">
143143
{# the argument of csrf_token() is an arbitrary string used to generate the token #}
144-
<input type="hidden" name="token" value="{{ csrf_token('delete-item') }}"/>
144+
<input type="hidden" name="token" value="{{ csrf_token('delete-item') }}">
145145

146146
<button type="submit">Delete item</button>
147147
</form>

security/remember_me.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ checkbox must have a name of ``_remember_me``:
121121
{# ... your form fields #}
122122

123123
<label>
124-
<input type="checkbox" name="_remember_me" checked/>
124+
<input type="checkbox" name="_remember_me" checked>
125125
Keep me logged in
126126
</label>
127127

0 commit comments

Comments
 (0)