Skip to content

Commit 6f256fc

Browse files
Merge branch '8.0' into 8.1
* 8.0: (49 commits) [Runtime][FrameworkBundle] Trust argv on CLI-like SAPIs in the remaining QUERY_STRING gates Fix tests and merge resolution after merging 6.4 into 7.4 [FrameworkBundle] Allow to pass `doctrine_open_transaction_logger`’s entity manager name positionally Remove protectedHeaderOnly from claim checkers [String][Mime] Reject objects in typed-string properties during __unserialize [Cache] Fix strlen(null) deprecation on RelayCluster path in RedisTrait::doClear() [Scheduler] Recover pending RecurringMessages after consumer stops midway [SecurityBundle] Fix Security::login() across firewalls [Routing][RateLimiter][Mime][Security] Harden __unserialize against __toString trampolines [Security] Initialize lazy users before serializing them in the session [Process] Stop leaking CGI/FastCGI request-context vars to subprocesses [Runtime] Trust argv on CLI-like SAPIs to fix subprocess args [Mailer] Harden default IP allowlist for Postmark and Brevo webhook parsers [Cache] Accept '_' and ':' in prefix passed to AbstractAdapter::clear() [HtmlSanitizer] Honor universal attribute sanitizers, apply maxInputLength to text contexts, document forceAttribute and allowAttribute caveats [Mailer][Notifier] Harden Mailchimp signature comparison and Smsbox IP allowlist [Translation] Don’t check the error message to know if Lokalise keys are missing [AssetMapper] Rewrite relative paths in `export ... from` statements [Yaml] Allow trailing newlines after the end-of-document marker [HttpKernel][WebProfilerBundle] Check logs priority name for both `WARNING` and `warning` ... # Conflicts: # src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig # src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php # src/Symfony/Component/HttpClient/CachingHttpClient.php # src/Symfony/Component/HttpClient/Tests/CachingHttpClientTest.php # src/Symfony/Component/HttpKernel/Kernel.php
2 parents 14188e7 + 5f4ac13 commit 6f256fc

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

Resources/views/Collector/logger.html.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@
462462
<tbody>
463463
{% for log in collector.processedLogs %}
464464
{% set css_class = 'error' == log.type ? 'error'
465-
: (log.priorityName == 'WARNING' or 'deprecation' == log.type) ? 'warning'
465+
: (log.priorityName in ['WARNING', 'warning'] or 'deprecation' == log.type) ? 'warning'
466466
: 'silenced' == log.type ? 'silenced'
467467
%}
468468
<tr class="log-status-{{ css_class }}" data-type="{{ log.type }}" data-priority="{{ log.priority }}" data-channel="{{ log.channel }}" style="{{ 'event' == log.channel or 'DEBUG' == log.priorityName ? 'display: none' }}">
@@ -471,9 +471,9 @@
471471
{{ log.timestamp|date('H:i:s.v') }}
472472
</time>
473473

474-
{% if log.type in ['error', 'deprecation', 'silenced'] or 'WARNING' == log.priorityName %}
474+
{% if log.type in ['error', 'deprecation', 'silenced'] or log.priorityName in ['WARNING', 'warning'] %}
475475
<span class="log-type-badge badge badge-{{ css_class }}">
476-
{% if 'error' == log.type or 'WARNING' == log.priorityName %}
476+
{% if 'error' == log.type or log.priorityName in ['WARNING', 'warning'] %}
477477
{{ log.priorityName|lower }}
478478
{% else %}
479479
{{ log.type|lower }}

0 commit comments

Comments
 (0)