feat: added some optimizations

Author: Given Ncube

src/Commands/GeneratePermissionsCommand.php

@@ -6,13 +6,11 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use ReflectionClass;
 use ReflectionException;
 use Spatie\Permission\Models\Permission;
 use SplFileInfo;
-use Symfony\Component\Filesystem\Filesystem;
 
 class GeneratePermissionsCommand extends Command
 {
@@ -53,12 +51,14 @@ public function handle(): int
 
     /**
      * Generate all permissions.
+     *
+     * @return void
      */
     protected function generatePermissionsForAllModels(): void
     {
-        $models = $this->getModels();
-
-        $models->each(fn(string $model) => $this->generatePermissions($model));
+        $this->getModels()->each(
+            fn(string $model) => $this->generatePermissions($model)
+        );
     }
 
     /**
@@ -79,26 +79,36 @@ public function generatePermissions(string $model): void
         );
     }
 
-    public function generatePermission(string $model, string $permission)
+    /**
+     * Generate a permission for a given model.
+     *
+     * @param string $model
+     * @param string $permission
+     * @return mixed
+     */
+    public function generatePermission(string $model, string $permission): mixed
     {
         if (
             Str::contains($permission, 'any') ||
             Str::contains($permission, 'all')
         ) {
             return Permission::updateOrCreate([
-                'name' => $permission . ' ' . Str::plural(Str::lower($model)),
+                'name' =>
+                    $permission .
+                    ' ' .
+                    Str::snake(Str::plural(Str::lower($model))),
             ]);
         }
 
         return Permission::updateOrCreate([
-            'name' => $permission . ' ' . Str::lower($model),
+            'name' => $permission . ' ' . Str::snake(Str::lower($model)),
         ]);
     }
 
     /**
      * Get all models.
      *
-     * @return array
+     * @return array|Collection
      */
     public function getModels(): array|Collection
     {

src/Commands/LaravelAuthorizerCommand.php

@@ -85,9 +85,9 @@ public function generateAllPolicies(): void
                 }
 
                 return $reflection->isSubclassOf(Model::class) &&
-                    ! $reflection->isAbstract();
+                    !$reflection->isAbstract();
             })
-            ->map(fn ($model) => Str::afterLast($model, '\\'));
+            ->map(fn($model) => Str::afterLast($model, '\\'));
 
         $models->each(function (string $model) {
             $this->generatePolicy($model, $model);
@@ -104,7 +104,7 @@ public function generatePlainPolicy(string $name): void
     {
         if (
             file_exists($this->getPolicyPath($name)) &&
-            ! $this->option('force')
+            !$this->option('force')
         ) {
             $this->error(sprintf('Policy "%s" already exists!', $name));
 
@@ -116,8 +116,8 @@ public function generatePlainPolicy(string $name): void
             'namespace' => $this->getNamespace(),
             'class' => $this->getClassName($name),
         ])->reduce(
-            fn ($carry, $value, $key) => Str::replace(
-                '{{ '.$key.' }}',
+            fn($carry, $value, $key) => Str::replace(
+                '{{ ' . $key . ' }}',
                 $value,
                 $carry
             )
@@ -137,7 +137,7 @@ private function generatePolicy(string $name, string $model): void
     {
         if (
             file_exists($this->getPolicyPath($name)) &&
-            ! $this->option('force')
+            !$this->option('force')
         ) {
             $this->error(sprintf('Policy "%s" already exists!', $name));
 
@@ -147,7 +147,8 @@ private function generatePolicy(string $name, string $model): void
         $compiled = collect([
             'name' => $name,
             'model' => $model,
-            'modelVariable' => strtolower($model) ===
+            'modelVariable' =>
+                strtolower($model) ===
                 strtolower(
                     Str::afterLast($this->getNamespacedUserModel(), '\\')
                 )
@@ -161,8 +162,8 @@ private function generatePolicy(string $name, string $model): void
             'namespacedUserModel' => $this->getNamespacedUserModel(),
             'user' => Str::afterLast($this->getNamespacedUserModel(), '\\'),
         ])->reduce(
-            static fn ($old, $value, $key) => Str::replace(
-                '{{ '.$key.' }}',
+            static fn($old, $value, $key) => Str::replace(
+                '{{ ' . $key . ' }}',
                 $value,
                 $old
             ),
@@ -175,11 +176,12 @@ private function generatePolicy(string $name, string $model): void
     /**
      * Get the path to the policy.
      *
+     * @param string $name
      * @return string
      */
     public function getPolicyPath(string $name): string
     {
-        return app_path('Policies/'.$this->getClassName($name).'.php');
+        return app_path('Policies/' . $this->getClassName($name) . '.php');
     }
 
     /**
@@ -189,7 +191,7 @@ public function getPolicyPath(string $name): string
      */
     public function getNamespace(): string
     {
-        return app()->getNamespace().'Policies';
+        return app()->getNamespace() . 'Policies';
     }
 
     /**
@@ -204,7 +206,7 @@ public function getClassName(string $name): string
             return Str::studly($name);
         }
 
-        return Str::studly($name).'Policy';
+        return Str::studly($name) . 'Policy';
     }
 
     /**
@@ -215,7 +217,7 @@ public function getClassName(string $name): string
      */
     public function getNamespacedModel(string $model): string
     {
-        return app()->getNamespace().'Models\\'.Str::studly($model);
+        return app()->getNamespace() . 'Models\\' . Str::studly($model);
     }
 
     /**
@@ -235,6 +237,6 @@ public function getNamespacedUserModel(): string
      */
     public function getStub(): string
     {
-        return __DIR__.'/stubs/policy.stub';
+        return __DIR__ . '/stubs/policy.stub';
     }
 }

src/LaravelAuthorizerServiceProvider.php

@@ -20,8 +20,6 @@ public function configurePackage(Package $package): void
         $package
             ->name('laravel-authorizer')
             ->hasConfigFile()
-            ->hasViews()
-            ->hasMigration('create_laravel-authorizer_table')
             ->hasCommands([
                 LaravelAuthorizerCommand::class,
                 GeneratePermissionsCommand::class,