[Debug] fix debug handlers config

nicolas-grekas · nicolas-grekas · commit e17c6c3d9307 · 2014-06-03T17:24:49.000+02:00
diff --git a/EventListener/DebugHandlersListener.php b/EventListener/DebugHandlersListener.php
@@ -34,10 +34,11 @@ public function __construct($exceptionHandler)
     public function configure()
     {
         if ($this->exceptionHandler) {
-            $mainHandler = set_exception_handler('var_dump');
+            $handler = set_exception_handler('var_dump');
+            $handler = is_array($handler) ? $handler[0] : null;
             restore_exception_handler();
-            if ($mainHandler instanceof ExceptionHandler) {
-                $mainHandler->setHandler($this->exceptionHandler);
+            if ($handler instanceof ExceptionHandler) {
+                $handler->setHandler($this->exceptionHandler);
             }
             $this->exceptionHandler = null;
         }

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,11 @@ public function __construct($exceptionHandler)`
`34`	`34`	`public function configure()`
`35`	`35`	`{`
`36`	`36`	`if ($this->exceptionHandler) {`
`37`		`- $mainHandler = set_exception_handler('var_dump');`
	`37`	`+ $handler = set_exception_handler('var_dump');`
	`38`	`+ $handler = is_array($handler) ? $handler[0] : null;`
`38`	`39`	`restore_exception_handler();`
`39`		`- if ($mainHandler instanceof ExceptionHandler) {`
`40`		`- $mainHandler->setHandler($this->exceptionHandler);`
	`40`	`+ if ($handler instanceof ExceptionHandler) {`
	`41`	`+ $handler->setHandler($this->exceptionHandler);`
`41`	`42`	`}`
`42`	`43`	`$this->exceptionHandler = null;`
`43`	`44`	`}`