Merge pull request #2651 from yiisoft/error-handler-adjustments

framework/CHANGELOG.md

@@ -186,6 +186,7 @@ Yii Framework 2 Change Log
 - Chg #2405: The CSS class of `MaskedInput` now defaults to `form-control` (qiangxue)
 - Chg #2426: Changed URL creation method signatures to be consistent (samdark)
 - Chg #2544: Changed `DetailView`'s `name:format:label` to `attribute:format:label` to match `GridView` (samdark)
+- Chg #2603: `yii\base\ErrorHandler` now extends `\ErrorHandler` (samdark)
 - Chg: Renamed `yii\jui\Widget::clientEventsMap` to `clientEventMap` (qiangxue)
 - Chg: Renamed `ActiveRecord::getPopulatedRelations()` to `getRelatedRecords()` (qiangxue)
 - Chg: Renamed `attributeName` and `className` to `targetAttribute` and `targetClass` for `UniqueValidator` and `ExistValidator` (qiangxue)

framework/base/ErrorException.php

@@ -15,10 +15,8 @@ use Yii;
  * @author Alexander Makarov <sam@rmcreative.ru>
  * @since 2.0
  */
-class ErrorException extends Exception
+class ErrorException extends \ErrorException
 {
-	protected $severity;
-
 	/**
 	 * Constructs the exception.
 	 * @link http://php.net/manual/en/errorexception.construct.php
@@ -74,16 +72,6 @@ class ErrorException extends Exception
 	}
 
 	/**
-	 * Gets the exception severity.
-	 * @link http://php.net/manual/en/errorexception.getseverity.php
-	 * @return int the severity level of the exception.
-	 */
-	final public function getSeverity()
-	{
-		return $this->severity;
-	}
-
-	/**
 	 * @return string the user-friendly name of this exception
 	 */
 	public function getName()
@@ -105,4 +93,32 @@ class ErrorException extends Exception
 		];
 		return isset($names[$this->getCode()]) ? $names[$this->getCode()] : 'Error';
 	}
+
+	/**
+	 * Returns the array representation of this object.
+	 * @return array the array representation of this object.
+	 */
+	public function toArray()
+	{
+		return $this->toArrayRecursive($this);
+	}
+
+	/**
+	 * Returns the array representation of the exception and all previous exceptions recursively.
+	 * @param \Exception $exception object
+	 * @return array the array representation of the exception.
+	 */
+	protected function toArrayRecursive($exception)
+	{
+		$array = [
+			'type' => get_class($exception),
+			'name' => $exception instanceof self ? $exception->getName() : 'Exception',
+			'message' => $exception->getMessage(),
+			'code' => $exception->getCode(),
+		];
+		if (($prev = $exception->getPrevious()) !== null) {
+			$array['previous'] = $this->toArrayRecursive($prev);
+		}
+		return $array;
+	}
 }