Laravel 11: New Slim Base Controller (#958)

realodix · Apr 19, 2024 · 6f449b1 · 6f449b1
1 parent 2bc95ef
commit 6f449b1
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 34 deletions.
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -2,11 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Routing\Controller as BaseController;
-
-class Controller extends BaseController
+abstract class Controller
 {
-    use AuthorizesRequests, ValidatesRequests;
+    //
 }
diff --git a/app/Http/Controllers/Dashboard/AboutSystemController.php b/app/Http/Controllers/Dashboard/AboutSystemController.php
@@ -7,12 +7,15 @@
 use App\Models\User;
 use App\Models\Visit;
 use App\Services\KeyGeneratorService;
+use Illuminate\Routing\Controllers\{HasMiddleware, Middleware};
 
-class AboutSystemController extends Controller
+class AboutSystemController extends Controller implements HasMiddleware
 {
-    public function __construct()
+    public static function middleware(): array
     {
-        $this->middleware('role:admin');
+        return [
+            new Middleware('role:admin'),
+        ];
     }
 
     /**

diff --git a/app/Http/Controllers/Dashboard/AllUrlController.php b/app/Http/Controllers/Dashboard/AllUrlController.php
@@ -4,15 +4,15 @@
 
 use App\Http\Controllers\Controller;
 use App\Models\Url;
+use Illuminate\Routing\Controllers\{HasMiddleware, Middleware};
 
-class AllUrlController extends Controller
+class AllUrlController extends Controller implements HasMiddleware
 {
-    /**
-     * AllUrlController constructor.
-     */
-    public function __construct()
+    public static function middleware(): array
     {
-        $this->middleware('role:admin');
+        return [
+            new Middleware('role:admin'),
+        ];
     }
 
     /**

diff --git a/app/Http/Controllers/Dashboard/DashboardController.php b/app/Http/Controllers/Dashboard/DashboardController.php
@@ -7,6 +7,7 @@
 use App\Models\Url;
 use App\Models\User;
 use App\Services\KeyGeneratorService;
+use Illuminate\Support\Facades\Gate;
 
 class DashboardController extends Controller
 {
@@ -32,7 +33,7 @@ public function view()
      */
     public function edit(Url $url)
     {
-        $this->authorize('updateUrl', $url);
+        Gate::authorize('updateUrl', $url);
 
         return view('backend.edit', ['url' => $url]);
     }
@@ -67,7 +68,7 @@ public function update(StoreUrl $request, Url $url)
      */
     public function delete(Url $url)
     {
-        $this->authorize('forceDelete', $url);
+        Gate::authorize('forceDelete', $url);
 
         $url->delete();
 

diff --git a/app/Http/Controllers/Dashboard/User/ChangePasswordController.php b/app/Http/Controllers/Dashboard/User/ChangePasswordController.php
@@ -5,6 +5,7 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\UpdateUserPassword;
 use App\Models\User;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Hash;
 
 class ChangePasswordController extends Controller
@@ -19,7 +20,7 @@ class ChangePasswordController extends Controller
      */
     public function view(User $user)
     {
-        $this->authorize('view', $user);
+        Gate::authorize('view', $user);
 
         return view('backend.user.changepassword', ['user' => $user]);
     }
@@ -35,7 +36,7 @@ public function view(User $user)
      */
     public function update(UpdateUserPassword $request, User $user)
     {
-        $this->authorize('updatePass', $user);
+        Gate::authorize('updatePass', $user);
 
         $user->password = Hash::make($request['new-password']);
         $user->save();

diff --git a/app/Http/Controllers/Dashboard/User/UserController.php b/app/Http/Controllers/Dashboard/User/UserController.php
@@ -5,15 +5,16 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\UpdateUserEmail;
 use App\Models\User;
+use Illuminate\Routing\Controllers\{HasMiddleware, Middleware};
+use Illuminate\Support\Facades\Gate;
 
-class UserController extends Controller
+class UserController extends Controller implements HasMiddleware
 {
-    /**
-     * UserController constructor.
-     */
-    public function __construct()
+    public static function middleware(): array
     {
-        $this->middleware('role:admin')->only('view');
+        return [
+            new Middleware('role:admin', only: ['view']),
+        ];
     }
 
     /**
@@ -36,7 +37,7 @@ public function view()
      */
     public function edit(User $user)
     {
-        $this->authorize('view', $user);
+        Gate::authorize('view', $user);
 
         return view('backend.user.profile', ['user' => $user]);
     }
@@ -52,7 +53,7 @@ public function edit(User $user)
      */
     public function update(UpdateUserEmail $request, User $user)
     {
-        $this->authorize('update', $user);
+        Gate::authorize('update', $user);
 
         $user->email = $request->email;
         $user->save();

diff --git a/app/Http/Controllers/UrlController.php b/app/Http/Controllers/UrlController.php
@@ -7,15 +7,16 @@
 use App\Models\User;
 use App\Models\Visit;
 use App\Services\QrCodeService;
+use Illuminate\Routing\Controllers\{HasMiddleware, Middleware};
+use Illuminate\Support\Facades\Gate;
 
-class UrlController extends Controller
+class UrlController extends Controller implements HasMiddleware
 {
-    /**
-     * UrlController constructor.
-     */
-    public function __construct()
+    public static function middleware(): array
     {
-        $this->middleware('urlhublinkchecker')->only('create');
+        return [
+            new Middleware('urlhublinkchecker', only: ['create']),
+        ];
     }
 
     /**
@@ -71,7 +72,7 @@ public function showDetail(Url $url)
      */
     public function delete(Url $url)
     {
-        $this->authorize('forceDelete', $url);
+        Gate::authorize('forceDelete', $url);
 
         $url->delete();