Skip to content

Commit

Permalink
Merge branch '6.4' into 7.0
Browse files Browse the repository at this point in the history
* 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
  ...
  • Loading branch information
nicolas-grekas committed Jan 29, 2024
2 parents 21f644a + a53a9e1 commit 8498458
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "base.html.twig" %}

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

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

{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

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

<label for="password">Password:</label>
<input type="password" id="password" name="_password">
<input type="password" id="password" name="_password" />

<input type="hidden" name="_target_path" value="">
<input type="hidden" name="_target_path" value="" />

<input type="submit" name="login">
<input type="submit" name="login" />
</form>

{% endblock %}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "base.html.twig" %}

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

<a href="{{ logout_path('default') }}">Log out</a>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@

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

<label for="password">Password:</label>
<input type="password" id="password" name="_password">
<input type="password" id="password" name="_password" />

<input type="hidden" name="_target_path" value="">
<input type="hidden" name="_target_path" value="" />

<input type="submit" name="login">
<input type="submit" name="login" />
</form>

{% endblock %}
2 changes: 1 addition & 1 deletion Tests/Functional/app/templates/base.html.twig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="{{ _charset }}">
<meta charset="{{ _charset }}" />
<title>{% block title %}Welcome!{% endblock %}</title>
{% block stylesheets %}{% endblock %}
</head>
Expand Down

0 comments on commit 8498458

Please sign in to comment.