Bladeren bron

Changed bag.php and request_panel.php to dump arrays and objects as yaml.

henrikbjorn 14 jaren geleden
bovenliggende
commit
c5ceb37f8b

+ 1 - 14
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/bag.php

@@ -4,19 +4,6 @@
         <th>Value</th>
     </tr>
     <?php foreach ($bag->keys() as $key): ?>
-        <tr>
-            <th><?php echo $key ?></th>
-            <td>
-                <?php if (is_object($bag->get($key))): ?>
-                    <em>Object</em>
-                <?php elseif (is_resource($bag->get($key))): ?>
-                    <em>Resource</em>
-                <?php elseif (is_array($bag->get($key))): ?>
-                    <em>Array</em>
-                <?php else: ?>
-                    <?php echo $bag->get($key) ?>
-                <?php endif; ?>
-            </td>
-        </tr>
+        <?php echo $view->render('WebProfilerBundle:Profiler:var_dump.php', array('key' => $key, 'value' => $bag->get($key))) ?>
     <?php endforeach; ?>
 </table>

+ 13 - 24
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/request_panel.php

@@ -44,28 +44,17 @@
 
 <h2>Response Session Attributes</h2>
 
-<table>
-    <tr>
-        <th>Key</th>
-        <th>Value</th>
-    </tr>
-
-    <?php if (count($sessionAttributes = $data->getSessionAttributes())):?>
-        <?php foreach ($sessionAttributes->getRawValue() as $key => $value): ?>
-            <tr>
-                <th><?php echo $key ?></th>
-                <td>
-                    <?php if (is_object($value)): ?>
-                        <em>Object</em>
-                    <?php elseif (is_resource($value)): ?>
-                        <em>Resource</em>
-                    <?php elseif (is_array($value)): ?>
-                        <em>Array</em>
-                    <?php else: ?>
-                        <?php echo $value ?>
-                    <?php endif; ?>
-                </td>
-            </tr>
+<?php if (count($sessionAttributes = $data->getSessionAttributes())):?>
+    <table>
+        <tr>
+            <th>Key</th>
+            <th>Value</th>
+        </tr>
+
+        <?php foreach ($sessionAttributes as $key => $value): ?>
+            <?php echo $view->render('WebProfilerBundle:Profiler:var_dump.php', array('key' => $key, 'value' => $value)) ?>
         <?php endforeach; ?>
-    <?php endif; ?>
-</table>
+    </table>
+<?php else: ?>
+    <em>No request session attributes</em>
+<?php endif; ?>

+ 17 - 0
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/var_dump.php

@@ -0,0 +1,17 @@
+<?php if (is_object($value) && $value instanceof Symfony\Component\OutputEscaper\BaseEscaper): ?>
+    <?php $value = $value->getRawValue() ?>
+<?php endif; ?>
+
+<tr>
+    <th><?php echo $key ?></th>
+    <td>
+        <?php if (is_resource($value)): ?>
+            <em>Resource</em>
+        <?php elseif (is_array($value) || is_object($value)): ?>
+            <em><?php echo ucfirst(gettype($value)) ?></em>
+            <?php echo Symfony\Component\Yaml\Inline::dump($value) ?>
+        <?php else: ?>
+            <?php echo $value ?>
+        <?php endif; ?>
+    </td>
+</tr>