Added Session Metadata info to the Request section of the WDT

dlsniper · dlsniper · commit 8dd2af77a43a · 2012-05-27T00:21:50.000+03:00
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
@@ -34,6 +34,10 @@
                 <b>Route name</b>
                 <span>{{ request_route }}</span>
             </div>
+            <div class="sf-toolbar-info-piece">
+                <b>Has session</b>
+                <span>{% if collector.sessionmetadata|length %}yes{% else %}no{% endif %}</span>
+            </div>
         {% endspaceless %}
     {% endset %}
     {% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': profiler_url } %}
@@ -109,6 +113,16 @@
 
     {% include 'WebProfilerBundle:Profiler:bag.html.twig' with { 'bag': collector.responseheaders } only %}
 
+    <h2>Session Metadata</h2>
+
+    {% if collector.sessionmetadata|length %}
+    {% include 'WebProfilerBundle:Profiler:table.html.twig' with { 'data': collector.sessionmetadata } only %}
+    {% else %}
+    <p>
+        <em>No session metadata</em>
+    </p>
+    {% endif %}
+
     <h2>Session Attributes</h2>
 
     {% if collector.sessionattributes|length %}
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -59,6 +59,14 @@ public function collect(Request $request, Response $response, \Exception $except
             $content = false;
         }
 
+        $sessionMetadata = array();
+
+        if ($request->hasSession()) {
+            $sessionMetadata['Created'] = date(DATE_RFC822, $request->getSession()->getMetadataBag()->getCreated());
+            $sessionMetadata['Last used'] = date(DATE_RFC822, $request->getSession()->getMetadataBag()->getLastUsed());
+            $sessionMetadata['Lifetime'] = $request->getSession()->getMetadataBag()->getLifetime();
+        }
+
         $this->data = array(
             'format'             => $request->getRequestFormat(),
             'content'            => $content,
@@ -71,6 +79,7 @@ public function collect(Request $request, Response $response, \Exception $except
             'request_cookies'    => $request->cookies->all(),
             'request_attributes' => $attributes,
             'response_headers'   => $responseHeaders,
+            'session_metadata'   => $sessionMetadata,
             'session_attributes' => $request->hasSession() ? $request->getSession()->all() : array(),
             'flashes'            => $request->hasSession() ? $request->getSession()->getFlashBag()->peekAll() : array(),
             'path_info'          => $request->getPathInfo(),
@@ -117,6 +126,11 @@ public function getResponseHeaders()
         return new ResponseHeaderBag($this->data['response_headers']);
     }
 
+    public function getSessionMetadata()
+    {
+        return $this->data['session_metadata'];
+    }
+
     public function getSessionAttributes()
     {
         return $this->data['session_attributes'];
