Merge remote branch 'vicb/profiler'

* vicb/profiler: [WebProfilerBundle] Sort tables by key name
symfony · Apr 22, 2011 · f1e14f5 · f1e14f5
2 parents 5c2c16f + a79a94b
commit f1e14f5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
@@ -115,10 +115,11 @@
             <th>Name</th>
             <th>Path</th>
         </tr>
-        {% for name, path in collector.bundles %}
+        {% set bundles = collector.bundles %}
+        {% for name in bundles|keys|sort %}
         <tr>
             <th>{{ name }}</th>
-            <td>{{ path }}</td>
+            <td>{{ bundles[name] }}</td>
         </tr>
         {% endfor %}
     </table>

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig
@@ -33,10 +33,11 @@
                 <th>Event name</th>
                 <th>Listener</th>
             </tr>
-            {% for listener in collector.notcalledlisteners %}
+            {% set listeners = collector.notcalledlisteners %}
+            {% for listener in listeners|keys|sort %}
                 <tr>
-                    <td><code>{{ listener.event }}</code></td>
-                    <td><code>{{ display_listener(listener) }}</code></td>
+                    <td><code>{{ listeners[listener].event }}</code></td>
+                    <td><code>{{ display_listener(listeners[listener]) }}</code></td>
                 </tr>
             {% endfor %}
         </table>

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
@@ -103,11 +103,11 @@
                 <th>Key</th>
                 <th>Value</th>
             </tr>
-
-            {% for key, value in collector.sessionattributes %}
+            {% set attributes = collector.sessionattributes %}
+            {% for key in attributes|keys|sort %}
                 <tr>
                     <th>{{ key }}</th>
-                    <td>{{ value|yaml_dump }}</td>
+                    <td>{{ attributes[key]|yaml_dump }}</td>
                 </tr>
             {% endfor %}
         </table>

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/bag.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/bag.html.twig
@@ -3,7 +3,7 @@
         <th>Key</th>
         <th>Value</th>
     </tr>
-    {% for key in bag.keys %}
+    {% for key in bag.keys|sort %}
         <tr>
             <th>{{ key }}</th>
             <td>{{ bag.get(key)|yaml_dump }}</td>