8000 Merge branch '5.2' into 5.3 · rubanooo/symfony@a67e57a · GitHub
[go: up one dir, main page]
Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit a67e57a

Browse files
fabpotfabpot
committed
Merge branch '5.2' into 5.3
* 5.2: Add missing validators translation Improve usage of twig ternary skip test
2 parents 88c5349 + 34a5daf commit a67e57a

File tree

12 files changed

+20
-12
lines changed

12 files changed

+20
-12
lines changed

‎src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
{%- endblock button_row -%}
2828

2929
{%- block hidden_row -%}
30-
{%- set style = row_attr.style is defined ? (row_attr.style ~ (row_attr.style|trim|last != ';' ? '; ')) : '' -%}
30+
{%- set style = row_attr.style is defined ? (row_attr.style ~ (row_attr.style|trim|last != ';' ? '; ')) -%}
3131
<tr{% with {attr: row_attr|merge({style: (style ~ ' display: none')|trim})} %}{{ block('attributes') }}{% endwith %}>
3232
<td colspan="2">
3333
{{- form_widget(form) -}}

‎src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{% block toolbar %}
66
{% if collector.token %}
77
{% set is_authenticated = collector.enabled and collector.authenticated %}
8-
{% set color_code = is_authenticated ? '' : 'yellow' %}
8+
{% set color_code = not is_authenticated ? 'yellow' %}
99
{% elseif collector.enabled %}
1010
{% set color_code = collector.authenticatorManagerEnabled ? 'yellow' : 'red' %}
1111
{% else %}

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
{% endblock %}
102102

103103
{% block menu %}
104-
<span class="label label-status-{{ collector.symfonyState == 'eol' ? 'red' : collector.symfonyState in ['eom', 'dev'] ? 'yellow' : '' }}">
104+
<span class="label label-status-{{ collector.symfonyState == 'eol' ? 'red' : collector.symfonyState in ['eom', 'dev'] ? 'yellow' }}">
105105
<span class="icon">{{ include('@WebProfiler/Icon/config.svg') }}</span>
106106
<strong>Configuration</strong>
107107
</span>

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
{% block toolbar %}
66
{% if collector.data.nb_errors > 0 or collector.data.forms|length %}
7-
{% set status_color = collector.data.nb_errors ? 'red' : '' %}
7+
{% set status_color = collector.data.nb_errors ? 'red' %}
88
{% set icon %}
99
{{ include('@WebProfiler/Icon/form.svg') }}
1010
<span class="sf-toolbar-value">

‎src/Symfony/Bundle/WebProfilerBundle/R 6D40 esources/views/Collector/logger.html.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,11 @@
201201

202202
<tbody>
203203
{% for log in logs %}
204-
{% set css_class = is_deprecation ? ''
205-
: log.priorityName in ['CRITICAL', 'ERROR', 'ALERT', 'EMERGENCY'] ? 'status-error'
204+
{% set css_class = not is_deprecation
205+
? log.priorityName in ['CRITICAL', 'ERROR', 'ALERT', 'EMERGENCY'] ? 'status-error'
206206
: log.priorityName == 'WARNING' ? 'status-warning'
207207
%}
208-
<tr class="{{ css_class }}"{% if show_level %} data-filter-level="{{ log.priorityName|lower }}"{% endif %}{% if channel_is_defined %} data-filter-channel="{{ log.channel is not null ? log.channel : '' }}"{% endif %}>
208+
<tr class="{{ css_class }}"{% if show_level %} data-filter-level="{{ log.priorityName|lower }}"{% endif %}{% if channel_is_defined %} data-filter-channel="{{ log.channel }}"{% endif %}>
209209
<td class="font-normal text-small" nowrap>
210210
{% if show_level %}
211211
<span class="colored text-bold">{{ log.priorityName }}</span>

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
{% block menu %}
6565
{% set events = collector.events %}
6666

67-
<span class="label {{ events.messages|length ? '' : 'disabled' }}">
67+
<span class="label {{ events.messages|empty ? 'disabled' }}">
6868
<span class="icon">{{ include('@WebProfiler/Icon/mailer.svg') }}</span>
6969

7070
<strong>E-mails</strong>

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{% block toolbar %}
44
{% set icon %}
5-
{% set status_color = (collector.memory / 1024 / 1024) > 50 ? 'yellow' : '' %}
5+
{% set status_color = (collector.memory / 1024 / 1024) > 50 ? 'yellow' %}
66
{{ include('@WebProfiler/Icon/memory.svg') }}
77
<span class="sf-toolbar-value">{{ '%.1f'|format(collector.memory / 1024 / 1024) }}</span>
88
<span class="sf-toolbar-label">MiB</span>

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{% set has_time_events = collector.events|length > 0 %}
77
{% set total_time = has_time_events ? '%.0f'|format(collector.duration) : 'n/a' %}
88
{% set initialization_time = collector.events|length ? '%.0f'|format(collector.inittime) : 'n/a' %}
9-
{% set status_color = has_time_events and collector.duration > 1000 ? 'yellow' : '' %}
9+
{% set status_color = has_time_events and collector.duration > 1000 ? 'yellow' %}
1010

1111
{% set icon %}
1212
{{ include('@WebProfiler/Icon/time.svg') }}

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/validator.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{% block toolbar %}
44
{% if collector.violationsCount > 0 or collector.calls|length %}
5-
{% set status_color = collector.violationsCount ? 'red' : '' %}
5+
{% set status_color = collector.violationsCount ? 'red' %}
66
{% set icon %}
77
{{ include('@WebProfiler/Icon/validator.svg') }}
88
<span class="sf-toolbar-value">

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
{%- endif -%}
124124
{%- endset %}
125125
{% if menu is not empty %}
126-
<li class="{{ name }} {{ name == panel ? 'selected' : '' }}">
126+
<li class="{{ name }} {{ name == panel ? 'selected' }}">
127127
<a href="{{ path('_profiler', { token: token, panel: name }) }}">{{ menu|raw }}</a>
128128
</li>
129129
{% endif %}

‎src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -879,6 +879,10 @@ public function testDisableStty()
879879

880880
public function testTraversableMultiselectAutocomplete()
881881
{
882+
if (!Terminal::hasSttyAvailable()) {
883+
$this->markTestSkipped('`stty` is required to test autocomplete functionality');
884+
}
885+
882886
// <NEWLINE>
883887
// F<TAB><NEWLINE>
884888
// A<3x UP ARROW><TAB>,F<TAB><NEWLINE>

‎src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,10 @@
386386
<source>This value is not a valid International Securities Identification Number (ISIN).</source>
387387
<target>Ova vrijednost nije ispravan međunarodni identifikacijski broj vrijednosnih papira (ISIN).</target>
388388
</trans-unit>
389+
<trans-unit id="100">
390+
<source>This value should be a valid expression.</source>
391+
<target>Ova vrijednost mora biti valjani izraz.</target>
392+
</trans-unit>
389393
</body>
390394
</file>
391395
</xliff>

0 commit comments

Comments
 (0)
0