Skip to content

Commit 8498458

Browse files
Merge branch '6.4' into 7.0
* 6.4: (21 commits) [ErrorHandler] Add missing self-closing tags on link elements Fix merge (bis) Fix merge Add missing return type [FrameworkBundle] ConfigBuilderCacheWarmer should be non-optional [HttpClient] Fix pausing responses before they start when using curl [Notifier] Updated the NTFY notifier to run without a user parameter [Translation] Fix constant domain resolution in PhpAstExtractor separate child and parent context in NotificationEmail on writes [Mailer] [Mailgun] Fix sender header encoding do not overwrite the cache key when it is false [Mailer] [Scaleway] Fix attachment handling [Mailer] Throw TransportException when unable to read from socket [Serializer] Rewrite `AbstractObjectNormalizer::createChildContext()` to use the provided `cache_key` from original context when creating child contexts Revert #47715 [HttpClient] Fix error chunk creation in passthru Adjusting and removing the 'review' attribute from the pt_br translation XML. [DependencyInjection] Fix loading all env vars from secrets when only a subset is needed Fix option filenameMaxLength to the File constraint (Image) [Serializer] Take unnamed variadic parameters into account when denormalizing ...
2 parents 21f644a + a53a9e1 commit 8498458

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed
Lines changed: 2 additions & 2 deletions
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 %}

Tests/Functional/Bundle/CsrfFormLoginBundle/Resources/views/Login/login.html.twig

Lines changed: 1 addition & 1 deletion
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 %}

Tests/Functional/Bundle/FormLoginBundle/Resources/views/Localized/login.html.twig

Lines changed: 4 additions & 4 deletions
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 %}

Tests/Functional/Bundle/FormLoginBundle/Resources/views/Login/after_login.html.twig

Lines changed: 1 addition & 1 deletion
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>.

Tests/Functional/Bundle/FormLoginBundle/Resources/views/Login/login.html.twig

Lines changed: 4 additions & 4 deletions
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 %}

Tests/Functional/app/templates/base.html.twig

Lines changed: 1 addition & 1 deletion
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>

0 commit comments

Comments
 (0)