Support not adding the Handler suffix to a classname for internal h…

…andlers
josegonzalez · Dec 26, 2015 · 9e0103f · 9e0103f
1 parent 4976168
commit 9e0103f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/src/Cake/ConsoleErrorHandler.php b/src/Cake/ConsoleErrorHandler.php
@@ -49,13 +49,17 @@ public function handle($exception)
     {
         $handlers = (array)Configure::read('Error.config.handlers');
         foreach ($handlers as $handler => $config) {
-            if (!class_exists($handler)) {
-                $handler = 'Josegonzalez\ErrorHandlers\Handler\\' . $handler;
+            $handlerClass = $handler;
+            if (!class_exists($handlerClass)) {
+                $handlerClass = 'Josegonzalez\ErrorHandlers\Handler\\' . $handler;
             }
-            if (!class_exists($handler)) {
+            if (!class_exists($handlerClass)) {
+                $handlerClass = 'Josegonzalez\ErrorHandlers\Handler\\' . $handler . 'Handler';
+            }
+            if (!class_exists($handlerClass)) {
                 continue;
             }
-            $instance = new $handler((array)$config);
+            $instance = new $handlerClass((array)$config);
             $instance->handle($exception);
         }
     }

diff --git a/src/Cake/ErrorHandler.php b/src/Cake/ErrorHandler.php
@@ -49,13 +49,17 @@ public function handle($exception)
     {
         $handlers = (array)Configure::read('Error.config.handlers');
         foreach ($handlers as $handler => $config) {
-            if (!class_exists($handler)) {
-                $handler = 'Josegonzalez\ErrorHandlers\Handler\\' . $handler;
+            $handlerClass = $handler;
+            if (!class_exists($handlerClass)) {
+                $handlerClass = 'Josegonzalez\ErrorHandlers\Handler\\' . $handler;
             }
-            if (!class_exists($handler)) {
+            if (!class_exists($handlerClass)) {
+                $handlerClass = 'Josegonzalez\ErrorHandlers\Handler\\' . $handler . 'Handler';
+            }
+            if (!class_exists($handlerClass)) {
                 continue;
             }
-            $instance = new $handler((array)$config);
+            $instance = new $handlerClass((array)$config);
             $instance->handle($exception);
         }
     }

diff --git a/src/Handler.php b/src/Handler.php
@@ -124,13 +124,17 @@ public function handle(Exception $exception)
     {
         $handlers = (array)$this->config('handlers');
         foreach ($handlers as $handler => $config) {
-            if (!class_exists($handler)) {
-                $handler = 'Josegonzalez\ErrorHandlers\Handler\\' . $handler;
+            $handlerClass = $handler;
+            if (!class_exists($handlerClass)) {
+                $handlerClass = 'Josegonzalez\ErrorHandlers\Handler\\' . $handler;
             }
-            if (!class_exists($handler)) {
+            if (!class_exists($handlerClass)) {
+                $handlerClass = 'Josegonzalez\ErrorHandlers\Handler\\' . $handler . 'Handler';
+            }
+            if (!class_exists($handlerClass)) {
                 continue;
             }
-            $instance = new $handler((array)$config);
+            $instance = new $handlerClass((array)$config);
             $instance->handle($exception);
         }
         return false;