Make boot method fluent

statamic · Nov 27, 2023 · af1fc1f · af1fc1f
1 parent 5c4b282
commit af1fc1f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/Auth/CorePermissions.php b/src/Auth/CorePermissions.php
@@ -214,9 +214,7 @@ protected function registerForms()
 
     protected function registerUtilities()
     {
-        Utility::boot();
-
-        Utility::all()->each(function ($utility) {
+        Utility::boot()->all()->each(function ($utility) {
             Permission::register("access {$utility->handle()} utility", function ($perm) use ($utility) {
                 return $perm
                     ->label(__('statamic::permissions.access_utility', ['title' => $utility->title()]))

diff --git a/src/CP/Utilities/UtilityRepository.php b/src/CP/Utilities/UtilityRepository.php
@@ -23,6 +23,8 @@ public function boot()
         foreach ($this->extensions as $callback) {
             $callback($this);
         }
+
+        return $this;
     }
 
     public function extend($callback)
@@ -70,10 +72,8 @@ public function findBySlug($slug)
 
     public function routes()
     {
-        $this->boot();
-
         Route::namespace('\\')->prefix('utilities')->name('utilities.')->group(function () {
-            $this->all()->each(function ($utility) {
+            $this->boot()->all()->each(function ($utility) {
                 if ($utility->action()) {
                     Route::get($utility->slug(), $utility->action())
                         ->middleware("can:access {$utility->handle()} utility")