Skip to content

Commit 67fc230

Browse files
Merge branch '4.4' into 5.0
* 4.4: updated VERSION for 3.4.40 update CONTRIBUTORS for 3.4.40 updated CHANGELOG for 3.4.40 [WebProfilerBundle] changed label of peak memory usage in the time & memory panels (MB into MiB) add tests for the ConstraintViolationBuilder class Improve dirname usage [PhpUnitBridge] Use COMPOSER_BINARY env var if available Allow invalidateTags calls to be traced by data collector [YAML] escape DEL(\x7f) fix compatibility with phpunit 9 [Cache] skip APCu in chains when the backend is disabled [Mailer] Add a comment to avoid more wrong PRs on this piece of code [Form] apply automatically step=1 for datetime-local input Fixing a bug where class_alias would cause incorrect items in debug:autowiring [DependencyInjection][ServiceSubscriber] Support late aliases
2 parents 6ad4b07 + aaeaa6a commit 67fc230

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Resources/views/Collector/memory.html.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
{% 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>
8-
<span class="sf-toolbar-label">MB</span>
8+
<span class="sf-toolbar-label">MiB</span>
99
{% endset %}
1010

1111
{% set text %}
1212
<div class="sf-toolbar-info-piece">
1313
<b>Peak memory usage</b>
14-
<span>{{ '%.1f'|format(collector.memory / 1024 / 1024) }} MB</span>
14+
<span>{{ '%.1f'|format(collector.memory / 1024 / 1024) }} MiB</span>
1515
</div>
1616

1717
<div class="sf-toolbar-info-piece">
1818
<b>PHP memory limit</b>
19-
<span>{{ collector.memoryLimit == -1 ? 'Unlimited' : '%.0f MB'|format(collector.memoryLimit / 1024 / 1024) }}</span>
19+
<span>{{ collector.memoryLimit == -1 ? 'Unlimited' : '%.0f MiB'|format(collector.memoryLimit / 1024 / 1024) }}</span>
2020
</div>
2121
{% endset %}
2222

Resources/views/Collector/time.html.twig

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

5353
{% if profile.collectors.memory %}
5454
<div class="metric">
55-
<span class="value">{{ '%.2f'|format(profile.collectors.memory.memory / 1024 / 1024) }} <span class="unit">MB</span></span>
55+
<span class="value">{{ '%.2f'|format(profile.collectors.memory.memory / 1024 / 1024) }} <span class="unit">MiB</span></span>
5656
<span class="label">Peak memory usage</span>
5757
</div>
5858
{% endif %}

0 commit comments

Comments
 (0)