Merge pull request #1327 from kamilsk/master

framework/yii/base/ErrorException.php

@@ -20,7 +20,7 @@ class ErrorException extends Exception
 	protected $severity;
 
 	/**
-	 * Constructs the exception
+	 * Constructs the exception.
 	 * @link http://php.net/manual/en/errorexception.construct.php
 	 * @param $message [optional]
 	 * @param $code [optional]
@@ -51,7 +51,6 @@ class ErrorException extends Exception
 				}
 
 				// XDebug has a different key name
-				$frame['args'] = [];
 				if (isset($frame['params']) && !isset($frame['args'])) {
 					$frame['args'] = $frame['params'];
 				}
@@ -64,17 +63,7 @@ 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;
-	}
-
-	/**
-	 * Returns if error is one of fatal type
+	 * Returns if error is one of fatal type.
 	 *
 	 * @param array $error error got from error_get_last()
 	 * @return bool if error is one of fatal type
@@ -85,6 +74,16 @@ 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()