PHP7 - Uncaught TypeError - Exception.php

Closes kohana#642
neo22s · Oct 20, 2015 · 8acf7ab · 8acf7ab
1 parent 0f670a3
commit 8acf7ab
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/classes/Kohana/Kohana/Exception.php b/classes/Kohana/Kohana/Exception.php
@@ -81,7 +81,7 @@ public function __toString()
 	 * @param   Exception  $e
 	 * @return  void
 	 */
-	public static function handler(Exception $e)
+	public static function handler($e)
 	{
 		$response = Kohana_Exception::_handler($e);
 
@@ -99,7 +99,7 @@ public static function handler(Exception $e)
 	 * @param   Exception  $e
 	 * @return  Response
 	 */
-	public static function _handler(Exception $e)
+	public static function _handler($e)
 	{
 		try
 		{
@@ -137,7 +137,7 @@ public static function _handler(Exception $e)
 	 * @param   int        $level
 	 * @return  void
 	 */
-	public static function log(Exception $e, $level = Log::EMERGENCY)
+	public static function log($e, $level = Log::EMERGENCY)
 	{
 		if (is_object(Kohana::$log))
 		{
@@ -160,8 +160,11 @@ public static function log(Exception $e, $level = Log::EMERGENCY)
 	 * @param   Exception  $e
 	 * @return  string
 	 */
-	public static function text(Exception $e)
+	public static function text($e)
 	{
+        if ( ! $e instanceof Exception AND ! $e instanceof Throwable )
+            throw InvalidArgumentException;
+
 		return sprintf('%s [ %s ]: %s ~ %s [ %d ]',
 			get_class($e), $e->getCode(), strip_tags($e->getMessage()), Debug::path($e->getFile()), $e->getLine());
 	}
@@ -173,8 +176,11 @@ public static function text(Exception $e)
 	 * @param   Exception  $e
 	 * @return  Response
 	 */
-	public static function response(Exception $e)
+	public static function response($e)
 	{
+        if ( ! $e instanceof Exception AND ! $e instanceof Throwable )
+            throw InvalidArgumentException;
+
 		try
 		{
 			// Get the exception information