Merge pull request #20 from Nyholm/decorator

Made the profiler page better

Author: cryptiklemur

src/Cache/LoggingCachePool.php

@@ -61,11 +61,13 @@ public function getItem($key, array $tags = [])
     {
         $call         = $this->timeCall(__FUNCTION__, [$key, $tags]);
         $result       = $call->result;
+        $call->isHit  = $result->isHit();
 
-        if ($result->isHit()) {
-            $call->result = sprintf('<DATA:%s>', gettype($result->get()));
+        // Display the result in a good way depending on the data type
+        if ($call->isHit) {
+            $call->result = $this->getValueRepresentation($result->get());
         } else {
-            $call->result = false;
+            $call->result = null;
         }
 
         $this->calls[] = $call;
@@ -91,11 +93,11 @@ public function deleteItem($key, array $tags = [])
 
     public function save(CacheItemInterface $item)
     {
-        $itemClone = clone $item;
-        $itemClone->set(sprintf('<DATA:%s', gettype($item->get())));
+        $key   = $item->getKey();
+        $value = $this->getValueRepresentation($item->get());
 
         $call            = $this->timeCall(__FUNCTION__, [$item]);
-        $call->arguments = ['<CacheItem>', $itemClone];
+        $call->arguments = ['<CacheItem>', $key, $value];
         $this->calls[]   = $call;
 
         return $call->result;
@@ -155,4 +157,27 @@ public function getCalls()
     {
         return $this->calls;
     }
+
+    /**
+     * Get a string to represent the value.
+     *
+     * @param mixed $value
+     *
+     * @return string
+     */
+    private function getValueRepresentation($value)
+    {
+        $type = gettype($value);
+        if (in_array($type, ['boolean', 'integer', 'double', 'string', 'NULL'])) {
+            $rep = $value;
+        } elseif ($type === 'array') {
+            $rep = json_encode($value);
+        } elseif ($type === 'object') {
+            $rep = get_class($value);
+        } else {
+            $rep = sprintf('<DATA:%s>', $type);
+        }
+
+        return $rep;
+    }
 }

src/DataCollector/CacheDataCollector.php

@@ -128,7 +128,7 @@ private function calculateStatistics()
                 $statistics[$name]['time'] += $call->time;
                 if ($call->name === 'getItem') {
                     $statistics[$name]['reads'] += 1;
-                    if ($call->result !== false) {
+                    if ($call->isHit) {
                         $statistics[$name]['hits'] += 1;
                     } else {
                         $statistics[$name]['misses'] += 1;

src/Resources/views/Collector/cache.html.twig

@@ -9,6 +9,15 @@
 
 {% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
 
+{% block head %}
+    {{ parent() }}
+    <style>
+        .color-red {
+            color:red;
+        }
+    </style>
+{% endblock head %}
+
 {% block toolbar %}
     {% set icon %}
     <img width="20" height="28" alt="Cache"
@@ -91,8 +100,12 @@
                     <li class="{{ i is odd ? 'odd' : 'even' }}">
                         <div>
                             <strong>Name</strong>: {{ call.name }}<br />
-                            <strong>Arguments</strong>: {{ call.arguments|json_encode() }}<br />
-                            <strong>Results</strong>: {{ call.result|json_encode() }}<br />
+                            <strong>Arguments</strong>: {{ call.arguments|json_encode|truncate(140) }}<br />
+                            <strong>Results</strong>: {% if call.result == false %}
+                                <span class="color-red">Miss</span>
+                            {% else %}
+                                {{ call.result|truncate(140) }}
+                            {% endif %}<br />
                         </div>
                         <small>
                             <strong>Time</strong>: {{ '%0.2f'|format(call.time * 1000) }} ms