Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PHP 7 support for exception handling #659

Merged
merged 1 commit into from
Jan 24, 2016
Merged

PHP 7 support for exception handling #659

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions classes/Kohana/Kohana/Exception.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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
{
Expand Down Expand Up @@ -137,7 +137,7 @@ public static function _handler(Exception $e)
* @param string $level
* @return void
*/
public static function log(Exception $e, $level = \Psr\Log\LogLevel::EMERGENCY)
public static function log($e, $level = \Psr\Log\LogLevel::EMERGENCY)
{
if (is_object(Kohana::$log))
{
Expand All @@ -162,8 +162,13 @@ public static function log(Exception $e, $level = \Psr\Log\LogLevel::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('Argument 1 passed to Kohana_Kohana_Exception::response() must be an instance of Exception or Throwable');
}

return sprintf('%s [ %s ]: %s ~ %s [ %d ]',
get_class($e), $e->getCode(), strip_tags($e->getMessage()), Debug::path($e->getFile()), $e->getLine());
}
Expand All @@ -175,8 +180,13 @@ 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('Argument 1 passed to Kohana_Kohana_Exception::response() must be an instance of Exception or Throwable');
}

try
{
// Get the exception information
Expand Down