compatibility with php 7 (still compatible with 5.3)

Author: arp

src/Mouf/Mvc/Splash/Routers/ExceptionRouter.php

@@ -47,24 +47,24 @@ public function __construct(Http500HandlerInterface $errorController, LoggerInte
     /**
      * Actually handle the exception depending.
      *
-     * @param \Exception $e
+     * @param \Throwable $throwable
      *
      * @return ResponseInterface
      */
-    private function handleException(\Exception $e, Request $request)
+    private function handleException($throwable, Request $request)
     {
         if ($this->log != null) {
             $this->log->error('Exception thrown inside a controller.', array(
-                    'exception' => $e,
+                    'exception' => $throwable,
             ));
         } else {
             // If no logger is set, let's log in PHP error_log
-            error_log($e->getMessage().' - '.$e->getTraceAsString());
+            error_log($throwable->getMessage().' - '.$throwable->getTraceAsString());
         }
 
         $response = SplashUtils::buildControllerResponse(
-            function () use ($e, $request) {
-                return $this->errorController->serverError($e, $request);
+            function () use ($throwable, $request) {
+                return $this->errorController->serverError($throwable, $request);
             }
         );
 

src/Mouf/Mvc/Splash/Utils/ExceptionUtils.php

@@ -51,9 +51,9 @@ private static function getHTMLBackTrace($backtrace)
      * Function called to display an exception if it occurs.
      * It will make sure to purge anything in the buffer before calling the exception displayer.
      *
-     * @param Exception $exception
+     * @param \Throwable $throwable
      */
-    public static function getHtmlForException(\Exception $exception)
+    public static function getHtmlForException($throwable)
     {
         //global $sys_error_reporting_mail;
         //global $sys_error_messages;
@@ -63,9 +63,9 @@ public static function getHtmlForException(\Exception $exception)
 
         $display_errors = ini_get('display_errors');
         $color = '#FF0000';
-        $type = 'Uncaught '.get_class($exception);
-        if ($exception->getCode() != null) {
-            $type .= ' with error code '.$exception->getCode();
+        $type = 'Uncaught '.get_class($throwable);
+        if ($throwable->getCode() != null) {
+            $type .= ' with error code '.$throwable->getCode();
         }
 
         $msg .= "<tr><td colspan='3' style='background-color:$color; color:white; text-align:center'><b>$type</b></td></tr>";
@@ -74,10 +74,10 @@ public static function getHtmlForException(\Exception $exception)
         $msg .= "<td style='background-color:#AAAAAA; color:white; text-align:center'>File</td>";
         $msg .= "<td style='background-color:#AAAAAA; color:white; text-align:center'>Line</td></tr>";
 
-        $msg .= "<tr><td style='background-color:#EEEEEE; color:black'><b>".nl2br($exception->getMessage()).'</b></td>';
-        $msg .= "<td style='background-color:#EEEEEE; color:black'>".self::displayFile($exception->getFile()).'</td>';
-        $msg .= "<td style='background-color:#EEEEEE; color:black'>".$exception->getLine().'</td></tr>';
-        $msg .= self::getHTMLBackTrace($exception->getTrace());
+        $msg .= "<tr><td style='background-color:#EEEEEE; color:black'><b>".nl2br($throwable->getMessage()).'</b></td>';
+        $msg .= "<td style='background-color:#EEEEEE; color:black'>".self::displayFile($throwable->getFile()).'</td>';
+        $msg .= "<td style='background-color:#EEEEEE; color:black'>".$throwable->getLine().'</td></tr>';
+        $msg .= self::getHTMLBackTrace($throwable->getTrace());
         $msg .= '</table>';
 
         return $msg;