created console errorHandler

framework/base/Application.php

@@ -561,7 +561,6 @@ abstract class Application extends Module
     {
         return [
             'log' => ['class' => 'yii\log\Dispatcher'],
-            'errorHandler' => ['class' => 'yii\base\ErrorHandler'],
             'view' => ['class' => 'yii\web\View'],
             'formatter' => ['class' => 'yii\base\Formatter'],
             'i18n' => ['class' => 'yii\i18n\I18N'],

framework/base/ErrorHandler.php

@@ -8,23 +8,20 @@
 namespace yii\base;
 
 use Yii;
-use yii\helpers\Console;
 use yii\web\HttpException;
 
 /**
  * ErrorHandler handles uncaught PHP errors and exceptions.
  *
- * ErrorHandler displays these errors using appropriate views based on the
- * nature of the errors and the mode the application runs at.
- *
  * ErrorHandler is configured as an application component in [[\yii\base\Application]] by default.
  * You can access that instance via `Yii::$app->errorHandler`.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Timur Ruziev <resurtm@gmail.com>
+ * @author Alexander Makarov <sam@rmcreative.ru>
+ * @author Carsten Brandt <mail@cebe.cc>
  * @since 2.0
  */
-class ErrorHandler extends Component
+abstract class ErrorHandler extends Component
 {
     /**
      * @var boolean whether to discard any existing page output before error display. Defaults to true.
@@ -176,54 +173,10 @@ class ErrorHandler extends Component
     }
 
     /**
-     * Renders an exception without using rich format.
+     * Renders the exception.
      * @param \Exception $exception the exception to be rendered.
      */
-    protected function renderException($exception)
-    {
-        if ($exception instanceof Exception && ($exception instanceof UserException || !YII_DEBUG)) {
-            $message = $this->formatMessage($exception->getName() . ': ') . $exception->getMessage();
-        } elseif (YII_DEBUG) {
-            if ($exception instanceof Exception) {
-                $message = $this->formatMessage("Exception ({$exception->getName()})");
-            } elseif ($exception instanceof ErrorException) {
-                $message = $this->formatMessage($exception->getName());
-            } else {
-                $message = $this->formatMessage('Exception');
-            }
-            $message .= $this->formatMessage(" '" . get_class($exception) . "'", [Console::BOLD, Console::FG_BLUE])
-                . " with message " . $this->formatMessage("'{$exception->getMessage()}'", [Console::BOLD]) //. "\n"
-                . "\n\nin " . dirname($exception->getFile()) . DIRECTORY_SEPARATOR . $this->formatMessage(basename($exception->getFile()), [Console::BOLD])
-                . ':' . $this->formatMessage($exception->getLine(), [Console::BOLD, Console::FG_YELLOW]) . "\n\n"
-                . $this->formatMessage("Stack trace:\n", [Console::BOLD]) . $exception->getTraceAsString();
-        } else {
-            $message = $this->formatMessage('Error: ') . $exception->getMessage();
-        }
-
-        if (PHP_SAPI === 'cli') {
-            Console::stderr($message . "\n");
-        } else {
-            echo $message . "\n";
-        }
-    }
-
-    /**
-     * Colorizes a message for console output.
-     * @param string $message the message to colorize.
-     * @param array $format the message format.
-     * @return string the colorized message.
-     * @see Console::ansiFormat() for details on how to specify the message format.
-     */
-    protected function formatMessage($message, $format = [Console::FG_RED, Console::BOLD])
-    {
-        $stream = (PHP_SAPI === 'cli') ? STDERR : STDOUT;
-        // try controller first to allow check for --color switch
-        if (Yii::$app->controller instanceof \yii\console\Controller && Yii::$app->controller->isColorEnabled($stream)
-            || Yii::$app instanceof \yii\console\Application && Console::streamSupportsAnsiColors($stream)) {
-            $message = Console::ansiFormat($message, $format);
-        }
-        return $message;
-    }
+    protected abstract function renderException($exception);
 
     /**
      * Logs the given exception

framework/console/Application.php

@@ -189,6 +189,7 @@ class Application extends \yii\base\Application
     public function coreComponents()
     {
         return array_merge(parent::coreComponents(), [
+            'errorHandler' => ['class' => 'yii\console\ErrorHandler'],
             'request' => ['class' => 'yii\console\Request'],
             'response' => ['class' => 'yii\console\Response'],
         ]);

framework/console/ErrorHandler.php

+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\console;
+
+use Yii;
+use yii\base\ErrorException;
+use yii\base\UserException;
+use yii\helpers\Console;
+
+/**
+ * ErrorHandler handles uncaught PHP errors and exceptions.
+ *
+ * ErrorHandler is configured as an application component in [[\yii\base\Application]] by default.
+ * You can access that instance via `Yii::$app->errorHandler`.
+ *
+ * @author Carsten Brandt <mail@cebe.cc>
+ * @since 2.0
+ */
+class ErrorHandler extends \yii\base\ErrorHandler
+{
+    /**
+     * Renders an exception using ansi format for console output.
+     * @param \Exception $exception the exception to be rendered.
+     */
+    protected function renderException($exception)
+    {
+        if ($exception instanceof Exception && ($exception instanceof UserException || !YII_DEBUG)) {
+            $message = $this->formatMessage($exception->getName() . ': ') . $exception->getMessage();
+        } elseif (YII_DEBUG) {
+            if ($exception instanceof Exception) {
+                $message = $this->formatMessage("Exception ({$exception->getName()})");
+            } elseif ($exception instanceof ErrorException) {
+                $message = $this->formatMessage($exception->getName());
+            } else {
+                $message = $this->formatMessage('Exception');
+            }
+            $message .= $this->formatMessage(" '" . get_class($exception) . "'", [Console::BOLD, Console::FG_BLUE])
+                . " with message " . $this->formatMessage("'{$exception->getMessage()}'", [Console::BOLD]) //. "\n"
+                . "\n\nin " . dirname($exception->getFile()) . DIRECTORY_SEPARATOR . $this->formatMessage(basename($exception->getFile()), [Console::BOLD])
+                . ':' . $this->formatMessage($exception->getLine(), [Console::BOLD, Console::FG_YELLOW]) . "\n\n"
+                . $this->formatMessage("Stack trace:\n", [Console::BOLD]) . $exception->getTraceAsString();
+        } else {
+            $message = $this->formatMessage('Error: ') . $exception->getMessage();
+        }
+
+        if (PHP_SAPI === 'cli') {
+            Console::stderr($message . "\n");
+        } else {
+            echo $message . "\n";
+        }
+    }
+
+    /**
+     * Colorizes a message for console output.
+     * @param string $message the message to colorize.
+     * @param array $format the message format.
+     * @return string the colorized message.
+     * @see Console::ansiFormat() for details on how to specify the message format.
+     */
+    protected function formatMessage($message, $format = [Console::FG_RED, Console::BOLD])
+    {
+        $stream = (PHP_SAPI === 'cli') ? STDERR : STDOUT;
+        // try controller first to allow check for --color switch
+        if (Yii::$app->controller instanceof \yii\console\Controller && Yii::$app->controller->isColorEnabled($stream)
+            || Yii::$app instanceof \yii\console\Application && Console::streamSupportsAnsiColors($stream)) {
+            $message = Console::ansiFormat($message, $format);
+        }
+        return $message;
+    }
+}
\ No newline at end of file

framework/web/ErrorHandler.php

@@ -62,7 +62,7 @@ class ErrorHandler extends \yii\base\ErrorHandler
 
     /**
      * Renders the exception.
-     * @param \Exception $exception the exception to be handled.
+     * @param \Exception $exception the exception to be rendered.
      */
     protected function renderException($exception)
     {