Various files

app/Providers/RouteServiceProvider.php

@@ -1,25 +1,10 @@
 <?php
-/**
- * RouteServiceProvider.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-declare(strict_types=1);
 
 namespace FireflyIII\Providers;
 
-use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Support\Facades\Route;
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 
-/**
- * Class RouteServiceProvider
- *
- * @package FireflyIII\Providers
- */
 class RouteServiceProvider extends ServiceProvider
 {
     /**
@@ -50,31 +35,11 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function map()
     {
-        $this->mapWebRoutes();
-
         $this->mapApiRoutes();
 
-        //
-    }
+        $this->mapWebRoutes();
 
-    /**
-     * Define the "api" routes for the application.
-     *
-     * These routes are typically stateless.
-     *
-     * @return void
-     */
-    protected function mapApiRoutes()
-    {
-        Route::group(
-            [
-                'middleware' => 'api',
-                'namespace'  => $this->namespace,
-                'prefix'     => 'api',
-            ], function ($router) {
-            require base_path('routes/api.php');
-        }
-        );
+        //
     }
 
     /**
@@ -86,13 +51,23 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected function mapWebRoutes()
     {
-        Route::group(
-            [
-                'middleware' => 'web',
-                'namespace'  => $this->namespace,
-            ], function ($router) {
-            require base_path('routes/web.php');
-        }
-        );
+        Route::middleware('web')
+             ->namespace($this->namespace)
+             ->group(base_path('routes/web.php'));
+    }
+
+    /**
+     * Define the "api" routes for the application.
+     *
+     * These routes are typically stateless.
+     *
+     * @return void
+     */
+    protected function mapApiRoutes()
+    {
+        Route::prefix('api')
+             ->middleware('api')
+             ->namespace($this->namespace)
+             ->group(base_path('routes/api.php'));
     }
 }