Skip to content

Commit 72df7d3

Browse files
committed
Merge branch '2.3' into 2.6
* 2.3: link to https://symfony.com where possible [FrameworkBundle] Added missing log in server:run command [HttpFoundation] Allow curly braces in trusted host patterns [profiler][security] check authenticated user by tokenClass instead of username. Use https://symfony.com/search for searching Conflicts: src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php src/Symfony/Component/Form/README.md src/Symfony/Component/Intl/README.md src/Symfony/Component/Routing/composer.json src/Symfony/Component/Security/README.md src/Symfony/Component/Translation/README.md src/Symfony/Component/Validator/README.md
2 parents 12d4690 + 3723b44 commit 72df7d3

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Resources/views/Collector/security.html.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{% extends '@WebProfiler/Profiler/layout.html.twig' %}
22

33
{% block toolbar %}
4-
{% if collector.user %}
4+
{% if collector.tokenClass %}
55
{% set color_code = (collector.enabled and collector.authenticated) ? 'green' : 'yellow' %}
66
{% set authentication_color_code = (collector.enabled and collector.authenticated) ? 'green' : 'red' %}
77
{% set authentication_color_text = (collector.enabled and collector.authenticated) ? 'Yes' : 'No' %}
88
{% else %}
99
{% set color_code = collector.enabled ? 'red' : 'black' %}
1010
{% endif %}
1111
{% set text %}
12-
{% if collector.user %}
12+
{% if collector.tokenClass %}
1313
<div class="sf-toolbar-info-piece">
1414
<b>Logged in as</b>
1515
<span class="sf-toolbar-status sf-toolbar-status-{{ color_code }}">{{ collector.user }}</span>
@@ -47,7 +47,7 @@
4747

4848
{% block panel %}
4949
<h2>Security</h2>
50-
{% if collector.user %}
50+
{% if collector.tokenClass %}
5151
<table>
5252
<tr>
5353
<th>Username</th>

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "symfony-bundle",
44
"description": "Symfony SecurityBundle",
55
"keywords": [],
6-
"homepage": "http://symfony.com",
6+
"homepage": "https://symfony.com",
77
"license": "MIT",
88
"authors": [
99
{
@@ -12,7 +12,7 @@
1212
},
1313
{
1414
"name": "Symfony Community",
15-
"homepage": "http://symfony.com/contributors"
15+
"homepage": "https://symfony.com/contributors"
1616
}
1717
],
1818
"require": {

0 commit comments

Comments
 (0)