Merge pull request #14 from kinglozzer/php7

FIX: PHP 7 compatibility

composer.json

@@ -16,12 +16,12 @@
 	"require": {
 		"composer/installers": "~1.0",
 		"monolog/monolog": "^1.7",
-		"filp/whoops": "^2.0"
+		"filp/whoops": "^2.0",
+		"silverstripe/framework": "^3.1"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "~3.7",
-		"symfony/class-loader": "~2.3",
-		"silverstripe/framework": "3.1.*@dev"
+		"symfony/class-loader": "~2.3"
 	},
 	"extra": {
 		"branch-alias": {

src/Camspiers/LoggerBridge/BacktraceReporter/BacktraceReporter.php

@@ -10,8 +10,8 @@ interface BacktraceReporter
 {
     /**
      * Returns a backtrace for logging
-     * @param  \Exception $exception
+     * @param  mixed      $exception
      * @return array
      */
-    public function getBacktrace(\Exception $exception = null);
+    public function getBacktrace($exception = null);
 }

src/Camspiers/LoggerBridge/BacktraceReporter/BasicBacktraceReporter.php

@@ -33,14 +33,14 @@ public function getBacktraceLimit()
 
     /**
      * Returns a basic backtrace
-     * @param  \Exception $exception
+     * @param  mixed      $exception
      * @return array
      */
-    public function getBacktrace(\Exception $exception = null)
+    public function getBacktrace($exception = null)
     {
         $skipLimit = false;
 
-        if ($exception instanceof \Exception) {
+        if ($exception instanceof \Exception || $exception instanceof \Throwable) {
             $backtrace = $exception->getTrace();
             foreach ($backtrace as $index => $backtraceCall) {
                 unset($backtrace[$index]['args']);

src/Camspiers/LoggerBridge/BacktraceReporter/FilteredBacktraceReporter.php

@@ -29,10 +29,10 @@ public function __construct($filteredFunctions)
 
     /**
      * Returns a filtered backtrace using regular expressions
-     * @param  \Exception $exception
+     * @param  mixed      $exception
      * @return array|void
      */
-    public function getBacktrace(\Exception $exception = null)
+    public function getBacktrace($exception = null)
     {
         $backtrace = parent::getBacktrace($exception);
 

src/Camspiers/LoggerBridge/ErrorReporter/DebugErrorReporter.php

@@ -23,10 +23,10 @@ public function __construct(EnvReporter $envReporter)
     }
 
     /**
-     * @param \Exception      $exception
+     * @param mixed           $exception
      * @param \SS_HTTPRequest $request
      */
-    public function reportError(\Exception $exception, \SS_HTTPRequest $request = null)
+    public function reportError($exception, \SS_HTTPRequest $request = null)
     {
         if (!$this->envReporter->isLive()) {
             Debug::showError(

src/Camspiers/LoggerBridge/ErrorReporter/ErrorReporter.php

@@ -7,5 +7,5 @@
  */
 interface ErrorReporter
 {
-    public function reportError(\Exception $exception, \SS_HTTPRequest $request = null);
+    public function reportError($exception, \SS_HTTPRequest $request = null);
 }

src/Camspiers/LoggerBridge/ErrorReporter/WhoopsPrettyErrorReporter.php

@@ -33,10 +33,10 @@ public function __construct(PrettyPageHandler $prettyHandler, EnvReporter $envRe
     }
 
     /**
-     * @param \Exception      $exception
+     * @param mixed           $exception
      * @param \SS_HTTPRequest $request
      */
-    public function reportError(\Exception $exception, \SS_HTTPRequest $request = null)
+    public function reportError($exception, \SS_HTTPRequest $request = null)
     {
         if (!$this->envReporter->isLive()) {
             $whoops = new Run();

src/Camspiers/LoggerBridge/LoggerBridge.php

@@ -471,10 +471,10 @@ public function errorHandler($errno, $errstr, $errfile, $errline)
 
     /**
      * Handles uncaught exceptions
-     * @param  \Exception  $exception
+     * @param  mixed       $exception
      * @return string|void
      */
-    public function exceptionHandler(\Exception $exception)
+    public function exceptionHandler($exception)
     {
         $context = array(
             'file'    => $exception->getFile(),