fixed incompatibilities with illuminate 7.x

Author: Sandu Luca

composer.json

@@ -4,8 +4,8 @@
     "license": "MIT",
     "require": {
         "php-di/php-di": "^6.1",
-        "illuminate/routing": "^7.21",
-        "illuminate/events": "^7.21"
+        "illuminate/routing": "^7.25",
+        "illuminate/events": "^7.25"
     },
     "autoload": {
         "psr-4": {

src/ExceptionHandler.php

@@ -7,16 +7,19 @@
 use GGbear\Routing\Exceptions\TokenAuthenticationException;
 use Illuminate\Http\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Throwable;
 
 class ExceptionHandler
 {
     /**
      * Report or log an exception.
      *
-     * @param  \Exception  $exception
+     * @param  \Throwable  $e
      * @return void
+     *
+     * @throws \Exception
      */
-    public function report(Exception $exception)
+    public function report(Throwable $e)
     {
         // parent::report($exception);
     }
@@ -25,30 +28,32 @@ public function report(Exception $exception)
      * Render an exception into an HTTP response.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
+     * @param  \Throwable  $e
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws \Throwable
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $e)
     {
 
         $response = new Response();
         $response->header("Content-Type", "application/json");
 
-        if ($exception instanceof BasicAuthenticationException) {
+        if ($e instanceof BasicAuthenticationException) {
             return $response->setContent([
                 'error' => true,
                 'message' => 'Basic authentication failed',
             ]);
         }
 
-        if ($exception instanceof TokenAuthenticationException) {
+        if ($e instanceof TokenAuthenticationException) {
             return $response->setContent([
                 'error' => true,
                 'message' => 'Token is invalid',
             ]);
         }
 
-        if ($exception instanceof NotFoundHttpException) {
+        if ($e instanceof NotFoundHttpException) {
             return $response->setContent([
                 'error' => true,
                 'message' => 'Invalid route',

src/Pipeline.php

@@ -3,9 +3,9 @@
 namespace GGbear\Routing;
 
 use DI\Container;
-use Exception;
 use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Http\Request;
+use Throwable;
 
 class Pipeline extends \Illuminate\Pipeline\Pipeline
 {
@@ -25,12 +25,12 @@ public function __construct(Container $container = null)
      * Handle the given exception.
      *
      * @param  mixed  $passable
-     * @param  \Exception  $e
+     * @param  \Throwable  $e
      * @return mixed
      *
-     * @throws \Exception
+     * @throws \Throwable
      */
-    protected function handleException($passable, Exception $e)
+    protected function handleException($passable, Throwable $e)
     {
         if (
             !$this->container->has(ExceptionHandler::class) ||

src/Router.php

@@ -53,9 +53,9 @@ public function __construct(Dispatcher $events, Container $container = null)
      * @param  array|string  $methods
      * @param  string  $uri
      * @param  mixed  $action
-     * @return Route
+     * @return \Illuminate\Routing\Route
      */
-    protected function newRoute($methods, $uri, $action)
+    public function newRoute($methods, $uri, $action)
     {
         $route = new Route($methods, $uri, $action);
         $route->setRouterDI($this);