Use Clockwork Collector for request/session

barryvdh · barryvdh · commit afacec2b8231 · 2015-07-13T15:44:24.000+02:00
diff --git a/src/LaravelDebugbar.php b/src/LaravelDebugbar.php
@@ -20,6 +20,7 @@
 use DebugBar\DataCollector\PhpInfoCollector;
 use DebugBar\DataCollector\RequestDataCollector;
 use DebugBar\DataCollector\TimeDataCollector;
+use Barryvdh\Debugbar\Support\Clockwork\ClockworkCollector;
 use DebugBar\DebugBar;
 use DebugBar\Storage\PdoStorage;
 use DebugBar\Storage\RedisStorage;
@@ -511,6 +512,23 @@ public function modifyResponse($request, $response)
             }
         }
 
+        if ($app['config']->get('debugbar.clockwork')) {
+
+            try {
+                $this->addCollector(new ClockworkCollector($request, $response, $sessionManager));
+            } catch (\Exception $e) {
+                $this->addException(
+                  new Exception(
+                    'Cannot add ClockworkCollector to Laravel Debugbar: ' . $e->getMessage(),
+                    $e->getCode(),
+                    $e
+                  )
+                );
+            }
+
+            $this->addClockworkHeaders($response);
+        }
+
         if ($response->isRedirection()) {
             try {
                 $this->stackData();
@@ -545,9 +563,6 @@ public function modifyResponse($request, $response)
             }
         }
 
-        if ($app['config']->get('debugbar.clockwork')) {
-            $this->addClockworkHeaders($response);
-        }
 
         // Stop further rendering (on subrequests etc)
         $this->disable();
diff --git a/src/Support/Clockwork/ClockworkCollector.php b/src/Support/Clockwork/ClockworkCollector.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Barryvdh\Debugbar\Support\Clockwork;
+
+use DebugBar\DataCollector\DataCollector;
+use DebugBar\DataCollector\DataCollectorInterface;
+use DebugBar\DataCollector\Renderable;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ *
+ * Based on \Symfony\Component\HttpKernel\DataCollector\RequestDataCollector by Fabien Potencier <fabien@symfony.com>
+ *
+ */
+class ClockworkCollector extends DataCollector implements DataCollectorInterface, Renderable
+{
+    /** @var \Symfony\Component\HttpFoundation\Request $request */
+    protected $request;
+    /** @var  \Symfony\Component\HttpFoundation\Request $response */
+    protected $response;
+    /** @var  \Symfony\Component\HttpFoundation\Session\SessionInterface $session */
+    protected $session;
+
+    /**
+     * Create a new SymfonyRequestCollector
+     *
+     * @param \Symfony\Component\HttpFoundation\Request $request
+     * @param \Symfony\Component\HttpFoundation\Request $response
+     * @param \Symfony\Component\HttpFoundation\Session\SessionInterface $session
+     */
+    public function __construct($request, $response, $session = null)
+    {
+        $this->request = $request;
+        $this->response = $response;
+        $this->session = $session;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+        return 'clockwork';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getWidgets()
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function collect()
+    {
+        $request = $this->request;
+        $response = $this->response;
+
+        $data = array(
+            'getData' => $request->query->all(),
+            'postData' => $request->request->all(),
+            'headers' => $request->headers->all(),
+            'cookies' => $request->cookies->all(),
+            'uri' => $request->getRequestUri(),
+            'method' => $request->getMethod(),
+            'responseStatus' => $response->getStatusCode(),
+        );
+
+        if ($this->session) {
+            $sessionAttributes = array();
+            foreach ($this->session->all() as $key => $value) {
+                $sessionAttributes[$key] = $value;
+            }
+            $data['sessionData'] = $sessionAttributes;
+        }
+
+        if (isset($data['postData']['php-auth-pw'])) {
+            $data['postData']['php-auth-pw'] = '******';
+        }
+
+        if (isset($data['postData']['PHP_AUTH_PW'])) {
+            $data['postData']['PHP_AUTH_PW'] = '******';
+        }
+
+        return $data;
+    }
+
+}
diff --git a/src/Support/Clockwork/Converter.php b/src/Support/Clockwork/Converter.php
@@ -33,14 +33,8 @@ public function convert($data)
             'responseDuration' => 0,
         ];
 
-
-        if (isset($data['request'])) {
-            $request = $data['request'];
-
-            $output['responseStatus'] = $request['status_code'];
-            foreach($request as $key => $value){
-                $output['headers'][$key] = [$value];
-            }
+        if (isset($data['clockwork'])) {
+            $output = array_merge($output, $data['clockwork']);
         }
 
         if (isset($data['time'])) {
@@ -123,10 +117,6 @@ public function convert($data)
             }
         }
 
-        if (isset($data['session'])) {
-            $output['sessionData'] = $data['session'];
-        }
-
         return $output;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -33,14 +33,8 @@ public function convert($data)`
`33`	`33`	`'responseDuration' => 0,`
`34`	`34`	`];`
`35`	`35`
`36`		`-`
`37`		`- if (isset($data['request'])) {`
`38`		`- $request = $data['request'];`
`39`		`-`
`40`		`- $output['responseStatus'] = $request['status_code'];`
`41`		`- foreach($request as $key => $value){`
`42`		`- $output['headers'][$key] = [$value];`
`43`		`- }`
	`36`	`+ if (isset($data['clockwork'])) {`
	`37`	`+ $output = array_merge($output, $data['clockwork']);`
`44`	`38`	`}`
`45`	`39`
`46`	`40`	`if (isset($data['time'])) {`
`@@ -123,10 +117,6 @@ public function convert($data)`
`123`	`117`	`}`
`124`	`118`	`}`
`125`	`119`
`126`		`- if (isset($data['session'])) {`
`127`		`- $output['sessionData'] = $data['session'];`
`128`		`- }`
`129`		`-`
`130`	`120`	`return $output;`
`131`	`121`	`}`
`132`	`122`