Skip to content

Commit 5f4ac13

Browse files
Merge branch '7.4' into 8.0
* 7.4: (46 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: # CHANGELOG-8.0.md # src/Symfony/Component/HttpKernel/Kernel.php # src/Symfony/Component/Mime/Part/SMimePart.php # src/Symfony/Component/Mime/Part/TextPart.php # src/Symfony/Component/String/UnicodeString.php
2 parents 1d92c5e + 153076b commit 5f4ac13

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
@@ -455,7 +455,7 @@
455455
<tbody>
456456
{% for log in collector.processedLogs %}
457457
{% set css_class = 'error' == log.type ? 'error'
458-
: (log.priorityName == 'WARNING' or 'deprecation' == log.type) ? 'warning'
458+
: (log.priorityName in ['WARNING', 'warning'] or 'deprecation' == log.type) ? 'warning'
459459
: 'silenced' == log.type ? 'silenced'
460460
%}
461461
<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' }}">
@@ -464,9 +464,9 @@
464464
{{ log.timestamp|date('H:i:s.v') }}
465465
</time>
466466

467-
{% if log.type in ['error', 'deprecation', 'silenced'] or 'WARNING' == log.priorityName %}
467+
{% if log.type in ['error', 'deprecation', 'silenced'] or log.priorityName in ['WARNING', 'warning'] %}
468468
<span class="log-type-badge badge badge-{{ css_class }}">
469-
{% if 'error' == log.type or 'WARNING' == log.priorityName %}
469+
{% if 'error' == log.type or log.priorityName in ['WARNING', 'warning'] %}
470470
{{ log.priorityName|lower }}
471471
{% else %}
472472
{{ log.type|lower }}

0 commit comments

Comments
 (0)