Dev (#47)

* Remove .idea * Change implements middleware * Remove custom route Co-authored-by: Hubert Krzysztofiak <hubert.krzysztofiak@escolasoft.com>
EscolaLMS · May 6, 2022 · de61570 · de61570
1 parent ebb22d2
commit de61570
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 28 deletions.
diff --git a/src/EscolaLmsServiceProvider.php b/src/EscolaLmsServiceProvider.php
@@ -2,9 +2,8 @@
 
 namespace EscolaLms\Core;
 
-use EscolaLms\Core\Http\Facades\Route;
 use EscolaLms\Core\Http\Middleware\SetTimezoneForUserMiddleware;
-use Illuminate\Routing\Router;
+use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Support\ServiceProvider;
 
 class EscolaLmsServiceProvider extends ServiceProvider
@@ -19,9 +18,8 @@ public function register()
 
     public function boot()
     {
-        $router = $this->app->make(Router::class);
-        $router->aliasMiddleware('set_timezone', SetTimezoneForUserMiddleware::class);
-        Route::extend('set_timezone');
+        $this->app->make(Kernel::class)
+            ->pushMiddleware(SetTimezoneForUserMiddleware::class);
 
         $this->loadConfig();
         $this->loadRoutesFrom(__DIR__ . '/routes.php');

diff --git a/src/Http/Facades/Route.php b/src/Http/Facades/Route.php
diff --git a/src/routes.php b/src/routes.php
@@ -1,8 +1,8 @@
 <?php
 
 use EscolaLms\Core\Http\Controllers\CoreController;
-use EscolaLms\Core\Http\Facades\Route;
+use Illuminate\Support\Facades\Route;
 
-Route::group(['middleware' => Route::apply(['auth:api']), 'prefix' => 'api/core'], function () {
+Route::group(['middleware' => ['auth:api'], 'prefix' => 'api/core'], function () {
     Route::get('/packages', [CoreController::class, 'packages']);
 });