Prevent adding collectors twice

barryvdh · barryvdh · commit e4bc8fdf934c · 2016-04-16T23:02:55.000+02:00
diff --git a/src/LaravelDebugbar.php b/src/LaravelDebugbar.php
@@ -506,7 +506,7 @@ public function modifyResponse(Request $request, Response $response)
             $httpDriver = new SymfonyHttpDriver($sessionManager, $response);
             $this->setHttpDriver($httpDriver);
 
-            if ($this->shouldCollect('session')) {
+            if ($this->shouldCollect('session') && ! $this->hasCollector('session')) {
                 try {
                     $this->addCollector(new SessionCollector($sessionManager));
                 } catch (\Exception $e) {
@@ -537,7 +537,7 @@ public function modifyResponse(Request $request, Response $response)
             }
         }
 
-        if ($app['config']->get('debugbar.clockwork')) {
+        if ($app['config']->get('debugbar.clockwork') && ! $this->hasCollector('clockwork')) {
 
             try {
                 $this->addCollector(new ClockworkCollector($request, $response, $sessionManager));

Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ public function modifyResponse(Request $request, Response $response)`
`506`	`506`	`$httpDriver = new SymfonyHttpDriver($sessionManager, $response);`
`507`	`507`	`$this->setHttpDriver($httpDriver);`
`508`	`508`
`509`		`- if ($this->shouldCollect('session')) {`
	`509`	`+ if ($this->shouldCollect('session') && ! $this->hasCollector('session')) {`
`510`	`510`	`try {`
`511`	`511`	`$this->addCollector(new SessionCollector($sessionManager));`
`512`	`512`	`} catch (\Exception $e) {`
`@@ -537,7 +537,7 @@ public function modifyResponse(Request $request, Response $response)`
`537`	`537`	`}`
`538`	`538`	`}`
`539`	`539`
`540`		`- if ($app['config']->get('debugbar.clockwork')) {`
	`540`	`+ if ($app['config']->get('debugbar.clockwork') && ! $this->hasCollector('clockwork')) {`
`541`	`541`
`542`	`542`	`try {`
`543`	`543`	`$this->addCollector(new ClockworkCollector($request, $response, $sessionManager));`