A new batch of updates

symfony · fabpot · Jul 31, 2015 · Jul 1, 2015 · Jul 2, 2015 · Jul 2, 2015
commit 64b8f38ddf954ae686b6e6ee9e4142077b54cac0
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
@@ -1,8 +1,6 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
 {% block toolbar %}
-
-    {# Symfony Information #}
     {% if 'unknown' == collector.symfonyState %}
         {% set block_status = '' %}
         {% set symfony_version_status = 'Unable to retrieve information about the Symfony version.' %}
@@ -21,83 +19,84 @@
     {% endif %}
 
     {% set icon %}
-            {% if collector.applicationname %}
-                <span class="sf-toolbar-label">{{ collector.applicationname }}</span>
-                <span class="sf-toolbar-value">{{ collector.applicationversion }}</span>
-            {% elseif collector.symfonyState is defined %}
+            {% if collector.symfonyState is defined %}
                 <a href="https://symfony.com/" title="{{ symfony_version_status }}">
-                    <span class="sf-toolbar-label">symfony</span>
+                    <span class="sf-toolbar-label">
+                        {{ include('@WebProfiler/Icon/symfony.svg.twig') }}
+                    </span>
                     <span class="sf-toolbar-value">{{ collector.symfonyversion }}</span>
                 </a>
+            {% elseif collector.applicationname %}
+                <span class="sf-toolbar-label">{{ collector.applicationname }}</span>
+                <span class="sf-toolbar-value">{{ collector.applicationversion }}</span>
             {% endif %}
     {% endset %}
+
     {% set text %}
+        {% if collector.symfonyversion is defined %}
+            <div class="sf-toolbar-info-piece">
+                <a href="https://symfony.com/doc/{{ collector.symfonyversion }}/index.html" rel="help">
+                    Read Symfony {{ collector.symfonyversion }} Docs
+                </a>
+            </div>
+        {% endif %}
+
         {% if collector.applicationname %}
             <div class="sf-toolbar-info-piece">
                 {{ collector.applicationname }} <b>{{ collector.applicationversion }}</b>
             </div>
         {% endif %}
+
         <div class="sf-toolbar-info-piece">
-            <a href="https://symfony.com/doc/{{ collector.symfonyversion }}/index.html" rel="help">
-                Read Symfony {{ collector.symfonyversion }} Docs
-            </a>
+            <b>Profiler token</b>
+            <span>
+                {% if profiler_url %}
+                    <a href="{{ profiler_url }}">{{ collector.token }}</a>
+                {% else %}
+                    {{ collector.token }}
+                {% endif %}
+            </span>
         </div>
+
         {% if 'n/a' != collector.appname %}
             <div class="sf-toolbar-info-piece">
                 <b>Kernel name</b>
                 <span>{{ collector.appname }}</span>
             </div>
         {% endif %}
+
         {% if 'n/a' != collector.env %}
             <div class="sf-toolbar-info-piece">
                 <b>Environment</b>
                 <span>{{ collector.env }}</span>
             </div>
         {% endif %}
+
         {% if 'n/a' != collector.debug %}
             <div class="sf-toolbar-info-piece">
                 <b>Debug</b>
-                <span class="{{ debug_status_class }}">{{ collector.debug ? 'en' : 'dis' }}abled</span>
+                <span class="{{ debug_status_class }}">{{ collector.debug ? 'enabled' : 'disabled' }}</span>
                </div>
         {% endif %}
+
+        <div class="sf-toolbar-info-piece sf-toolbar-info-php">
+            <b>PHP version</b>
+            <span>{{ collector.phpversion }}</span>
+        </div>
+
+        <div class="sf-toolbar-info-piece sf-toolbar-info-php-ext">
+            <b>PHP Extensions</b>
+            <span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasxdebug ? 'green' : 'red' }}">xdebug</span>
+            <span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasaccelerator ? 'green' : 'red' }}">accel</span>
+        </div>
+
         <div class="sf-toolbar-info-piece">
-            <b>Profiler token</b>
-            <span>
-                {% if profiler_url %}
-                    <a href="{{ profiler_url }}">{{ collector.token }}</a>
-                {% else %}
-                    {{ collector.token }}
-                {% endif %}
-            </span>
+            <b>PHP SAPI</b>
+            <span>{{ collector.sapiName }}</span>
         </div>
     {% endset %}
-    {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': false, 'block_name': 'config-symfony', 'block_status': block_status } %}
 
-    {# PHP Information #}
-    {% set icon %}
-        <a href="{{ path('_profiler_phpinfo') }}">
-            <span class="sf-toolbar-label">php</span>
-            <span class="sf-toolbar-value">{{ collector.phpversion }}</span>
-        </a>
-    {% endset %}
-    {% set text %}
-        {% spaceless %}
-            <div class="sf-toolbar-info-piece sf-toolbar-info-php">
-                <b>PHP</b>
-                <span>{{ collector.phpversion }}</span>
-            </div>
-            <div class="sf-toolbar-info-piece sf-toolbar-info-php-ext">
-                <b>PHP Extensions</b>
-                <span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasxdebug ? 'green' : 'red' }}">xdebug</span>
-                <span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasaccelerator ? 'green' : 'red' }}">accel</span>
-            </div>
-            <div class="sf-toolbar-info-piece">
-                <b>PHP SAPI</b>
-                <span>{{ collector.sapiName }}</span>
-            </div>
-        {% endspaceless %}
-    {% endset %}
-    {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': false, 'block_name': 'config-php' } %}
+    {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: false, status: block_status }) }}
 {% endblock %}
 
 {% block menu %}

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
@@ -15,7 +15,7 @@
             </span>
         {% endset %}
 
-        {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url, 'block_status': collector.data.nb_errors ? 'red' : '' } %}
+        {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url, status: collector.data.nb_errors ? 'red' : '' }) }}
     {% endif %}
 {% endblock %}
 

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -30,7 +30,7 @@
                 </div>
             {% endif %}
         {% endset %}
-        {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url, 'block_status': status_color } %}
+        {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url, status: status_color }) }}
     {% endif %}
 {% endblock %}
 

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig
@@ -19,5 +19,5 @@
             <span>{{ collector.memoryLimit == -1 ? '&infin;' : '%.1f'|format(collector.memoryLimit / 1024 / 1024)|escape }} MB</span>
         </div>
     {% endset %}
-    {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': false, 'block_status': status_color } %}
+    {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: false, status: status_color }) }}
 {% endblock %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
@@ -47,7 +47,7 @@
             </div>
         {% endspaceless %}
     {% endset %}
-    {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url } %}
+    {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url }) }}
 {% endblock %}
 
 {% block menu %}

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
@@ -28,7 +28,7 @@
             <span>{{ duration }} ms</span>
         </div>
     {% endset %}
-    {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url, 'block_status': status_color } %}
+    {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url, status: status_color }) }}
 {% endblock %}
 
 {% block menu %}

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig
@@ -31,7 +31,7 @@
                 </div>
             {% endif %}
         {% endset %}
-        {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url, 'block_status': status_color } %}
+        {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url, status: status_color }) }}
     {% endif %}
 {% endblock %}
 

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig
@@ -27,7 +27,7 @@
             <span>{{ collector.macrocount }}</span>
         </div>
     {% endset %}
-    {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url } %}
+    {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url }) }}
 {% endblock %}
 
 {% block menu %}

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
@@ -84,8 +84,7 @@
 .sf-toolbar-block a:hover {
     text-decoration: none;
 }
-.sf-toolbar-block-config-symfony,
-.sf-toolbar-block-config-php {
+.sf-toolbar-block-config {
     float: right;
     margin-left: 0;
     margin-right: 0;

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
@@ -15,11 +15,11 @@
 
             Sfjs.setPreference('toolbar/displayState', 'block');
         ">
-            <svg width="26" height="28" xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" viewBox="0 0 26 28" enable-background="new 0 0 26 28" xml:space="preserve"><path fill="#FFFFFF" d="M13 0C5.8 0 0 5.8 0 13c0 7.2 5.8 13 13 13c7.2 0 13-5.8 13-13C26 5.8 20.2 0 13 0z M20 7.5 c-0.6 0-1-0.3-1-0.9c0-0.2 0-0.4 0.2-0.6c0.1-0.3 0.2-0.3 0.2-0.4c0-0.3-0.5-0.4-0.7-0.4c-2 0.1-2.5 2.7-2.9 4.8l-0.2 1.1 c1.1 0.2 1.9 0 2.4-0.3c0.6-0.4-0.2-0.8-0.1-1.3C18 9.2 18.4 9 18.7 8.9c0.5 0 0.8 0.5 0.8 1c0 0.8-1.1 2-3.3 1.9 c-0.3 0-0.5 0-0.7-0.1L15 14.1c-0.4 1.7-0.9 4.1-2.6 6.2c-1.5 1.8-3.1 2.1-3.8 2.1c-1.3 0-2.1-0.6-2.2-1.6c0-0.9 0.8-1.4 1.3-1.4 c0.7 0 1.2 0.5 1.2 1.1c0 0.5-0.2 0.6-0.4 0.7c-0.1 0.1-0.3 0.2-0.3 0.4c0 0.1 0.1 0.3 0.4 0.3c0.5 0 0.9-0.3 1.2-0.5 c1.3-1 1.7-2.9 2.4-6.2l0.1-0.8c0.2-1.1 0.5-2.3 0.8-3.5c-0.9-0.7-1.4-1.5-2.6-1.8c-0.8-0.2-1.3 0-1.7 0.4C8.4 10 8.6 10.7 9 11.1 l0.7 0.7c0.8 0.9 1.3 1.7 1.1 2.7c-0.3 1.6-2.1 2.8-4.3 2.1c-1.9-0.6-2.2-1.9-2-2.7c0.2-0.6 0.7-0.8 1.2-0.6 c0.5 0.2 0.7 0.8 0.6 1.3c0 0.1 0 0.1-0.1 0.3C6 15 5.9 15.2 5.9 15.3c-0.1 0.4 0.4 0.7 0.8 0.8c0.8 0.3 1.7-0.2 1.9-0.9 c0.2-0.6-0.2-1.1-0.4-1.2l-0.8-0.9c-0.4-0.4-1.2-1.5-0.8-2.8c0.2-0.5 0.5-1 0.9-1.4c1-0.7 2-0.8 3-0.6c1.3 0.4 1.9 1.2 2.8 1.9 c0.5-1.3 1.1-2.6 2-3.8c0.9-1 2-1.7 3.3-1.8C20 4.8 21 5.4 21 6.3C21 6.7 20.8 7.5 20 7.5z"/></svg>
+            {{ include('@WebProfiler/Icon/symfony.svg.twig') }}
         </a>
     </div>
     <style>
-        {% include '@WebProfiler/Profiler/toolbar.css.twig' with { 'position': position, 'floatable': true } %}
+        {{ include('@WebProfiler/Profiler/toolbar.css.twig', { 'position': position, 'floatable': true }) }}
     </style>
     <div id="sfToolbarClearer-{{ token }}" style="clear: both; height: 38px;"></div>
 {% endif %}
@@ -43,7 +43,7 @@
             document.getElementById('sfMiniToolbar-{{ token }}').style.display = 'block';
             Sfjs.setPreference('toolbar/displayState', 'none');
         ">
-            <svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path fill="#AAA" d="M1490 1322q0 40-28 68l-136 136q-28 28-68 28t-68-28l-294-294-294 294q-28 28-68 28t-68-28l-136-136q-28-28-28-68t28-68l294-294-294-294q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 294 294-294q28-28 68-28t68 28l136 136q28 28 28 68t-28 68l-294 294 294 294q28 28 28 68z" /></svg>
+            {{ include('@WebProfiler/Icon/close.svg.twig') }}
         </a>
     {% endif %}
 </div>

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig
@@ -1,5 +1,5 @@
-<div class="sf-toolbar-block sf-toolbar-block-{{ block_name|default(name) }} sf-toolbar-status-{{ block_status|default('normal') }}">
-    {% if link %}<a href="{{ path('_profiler', { 'token': token, 'panel': name }) }}"{% endif %}
+<div class="sf-toolbar-block sf-toolbar-block-{{ name }} sf-toolbar-status-{{ status|default('normal') }}">
+    {% if link %}<a href="{{ path('_profiler', { token: token, panel: name }) }}"{% endif %}
         <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
         <div class="sf-toolbar-info">{{ text|default('') }}</div>
     {% if link %}</a>{% endif %}