Slightly modified to match PSR-12

Jurager · Jurager · commit ecc1193f9050 · 2025-03-03T22:03:50.000+05:00
diff --git a/config/teams.php b/config/teams.php
@@ -86,4 +86,4 @@
             'middleware' => 'web'
         ]
     ],
-];
+];
diff --git a/database/migrations/create_abilities_table.php b/database/migrations/create_abilities_table.php
@@ -5,8 +5,7 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     /**
      * Run the migrations.
      */
diff --git a/database/migrations/create_entity_ability_table.php b/database/migrations/create_entity_ability_table.php
@@ -4,8 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     /**
      * Run the migrations.
      */
diff --git a/database/migrations/create_entity_permission_table.php b/database/migrations/create_entity_permission_table.php
@@ -4,8 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     /**
      * Run the migrations.
      */
diff --git a/database/migrations/create_group_user_table.php b/database/migrations/create_group_user_table.php
@@ -4,8 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     /**
      * Run the migrations.
      */
diff --git a/database/migrations/create_groups_table.php b/database/migrations/create_groups_table.php
@@ -5,8 +5,7 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     /**
      * Run the migrations.
      */
diff --git a/database/migrations/create_invitations_table.php b/database/migrations/create_invitations_table.php
@@ -5,8 +5,7 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     /**
      * Run the migrations.
      */
diff --git a/database/migrations/create_permissions_table.php b/database/migrations/create_permissions_table.php
@@ -5,8 +5,7 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     /**
      * Run the migrations.
      */
diff --git a/database/migrations/create_roles_table.php b/database/migrations/create_roles_table.php
@@ -5,8 +5,7 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     /**
      * Run the migrations.
      */
diff --git a/database/migrations/create_team_user_table.php b/database/migrations/create_team_user_table.php
@@ -5,8 +5,7 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     /**
      * Run the migrations.
      */
@@ -30,4 +29,4 @@ public function down(): void
     {
         Schema::dropIfExists('team_user');
     }
-};
+};
diff --git a/database/migrations/create_teams_table.php b/database/migrations/create_teams_table.php
@@ -4,8 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     /**
      * Run the migrations.
      */
diff --git a/routes/web.php b/routes/web.php
@@ -6,4 +6,4 @@
 
 Route::middleware(Config::get('teams.invitations.routes.middleware'))
     ->get(Config::get('teams.invitations.routes.url'), [InviteController::class, 'inviteAccept'])
-    ->name('teams.invitations.accept');
+    ->name('teams.invitations.accept');
diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -36,19 +36,19 @@ public function handle(): void
         $this->call('vendor:publish', ['--tag' => 'teams-views', '--force' => true]);
 
         // Directories...
-        (new Filesystem)->ensureDirectoryExists(app_path('Actions/Teams'));
-        (new Filesystem)->ensureDirectoryExists(app_path('Events'));
-        (new Filesystem)->ensureDirectoryExists(app_path('Policies'));
+        (new Filesystem())->ensureDirectoryExists(app_path('Actions/Teams'));
+        (new Filesystem())->ensureDirectoryExists(app_path('Events'));
+        (new Filesystem())->ensureDirectoryExists(app_path('Policies'));
 
         // Actions...
-        (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/app/Actions/Teams', app_path('Actions/Teams/'));
+        (new Filesystem())->copyDirectory(__DIR__.'/../../stubs/app/Actions/Teams', app_path('Actions/Teams/'));
 
         // Policies...
-        (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/app/Policies', app_path('Policies'));
+        (new Filesystem())->copyDirectory(__DIR__.'/../../stubs/app/Policies', app_path('Policies'));
 
         // Controllers...
-        (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/app/Controllers', app_path('Http/Controllers/'));
+        (new Filesystem())->copyDirectory(__DIR__.'/../../stubs/app/Controllers', app_path('Http/Controllers/'));
 
         $this->info('All done. Have a nice journey.');
     }
-}
+}
diff --git a/src/Events/TeamEvent.php b/src/Events/TeamEvent.php
@@ -8,7 +8,9 @@
 
 abstract class TeamEvent
 {
-    use Dispatchable, InteractsWithSockets, SerializesModels;
+    use Dispatchable;
+    use InteractsWithSockets;
+    use SerializesModels;
 
     /**
      * The team instance.
diff --git a/src/Mail/Invitation.php b/src/Mail/Invitation.php
@@ -10,7 +10,8 @@
 
 class Invitation extends Mailable
 {
-    use Queueable, SerializesModels;
+    use Queueable;
+    use SerializesModels;
 
     /**
      * The team invitation instance.
@@ -38,4 +39,4 @@ public function build(): static
             'invitation' => $this->invitation,
         ])])->subject(__('Team Invitation'));
     }
-}
+}
diff --git a/src/Middleware/Ability.php b/src/Middleware/Ability.php
@@ -7,7 +7,6 @@
 
 class Ability extends Teams
 {
-
     /**
      * Handle incoming request.
      *
@@ -25,4 +24,4 @@ public function handle(Request $request, Closure $next, string $ability, ...$mod
 
         return $next($request);
     }
-}
+}
diff --git a/src/Middleware/Permission.php b/src/Middleware/Permission.php
@@ -7,7 +7,6 @@
 
 class Permission extends Teams
 {
-
     /**
      * Handle incoming request.
      *
@@ -26,4 +25,4 @@ public function handle(Request $request, Closure $next, string|array $permission
 
         return $next($request);
     }
-}
+}
diff --git a/src/Middleware/Teams.php b/src/Middleware/Teams.php
@@ -12,7 +12,6 @@
 
 class Teams
 {
-
     /**
      * Check if the request has authorization to continue.
      *
@@ -122,7 +121,7 @@ protected function getGateArguments(Request $request, ?array $models): array
         }
 
         // Filter out invalid model instances and fetch actual model instances
-        return array_map(fn($model) => $model instanceof Model ? $model : $this->getModel($request, $model), $models);
+        return array_map(fn ($model) => $model instanceof Model ? $model : $this->getModel($request, $model), $models);
     }
 
     /**
@@ -145,4 +144,4 @@ protected function getModel(Request $request, string $model): string
         // Otherwise, retrieve the model from the request route, falling back to the original model name
         return $request->route($trimmedModel) ?: $trimmedModel;
     }
-}
+}
diff --git a/src/Models/Ability.php b/src/Models/Ability.php
@@ -63,4 +63,4 @@ public function roles(): MorphToMany
             ->withPivot('forbidden')
             ->withTimestamps();
     }
-}
+}
diff --git a/src/Models/Group.php b/src/Models/Group.php
@@ -103,7 +103,7 @@ public function attachUser(Collection|Model $user): bool
         $users = $user instanceof Collection ? $user : collect([$user]);
 
         // Filter only those users who are in the team
-        $filteredUserIds = $users->filter(fn($item) => $this->team->hasUser($item));
+        $filteredUserIds = $users->filter(fn ($item) => $this->team->hasUser($item));
 
         // If there are users left after filtering, synchronize and return the result
         return $filteredUserIds->isNotEmpty() && $this->users()->syncWithoutDetaching($filteredUserIds->pluck('id')) > 0;
@@ -118,9 +118,9 @@ public function detachUser(Collection|Model $user): bool
         $users = $user instanceof Collection ? $user : collect([$user]);
 
         // Filter only those users who are in the team
-        $filteredUserIds  = $users->filter(fn($item) => $this->team->hasUser($item));
+        $filteredUserIds  = $users->filter(fn ($item) => $this->team->hasUser($item));
 
         // If there are any users left after filtering, we execute detach and return the result
         return $filteredUserIds ->isNotEmpty() && $this->users()->detach($filteredUserIds->pluck('id')) > 0;
     }
-}
+}
diff --git a/src/Models/Invitation.php b/src/Models/Invitation.php
@@ -39,5 +39,5 @@ public function accept()
         // @todo: accept invitation
         // $this->team()->users()->attach($user, ['role' => $role]);
         // $invite->delete();
-   }
-}
+    }
+}
diff --git a/src/Models/Permission.php b/src/Models/Permission.php
@@ -44,4 +44,4 @@ public function roles(): MorphToMany
     {
         return $this->morphedByMany(Teams::model('role'), 'entity', 'entity_permission');
     }
-}
+}
diff --git a/src/Models/Team.php b/src/Models/Team.php
@@ -34,4 +34,4 @@ public function __construct(array $attributes = [])
         parent::__construct($attributes);
         $this->table = Config::get('teams.tables.teams', 'teams');
     }
-}
+}
diff --git a/src/Support/Facades/Teams.php b/src/Support/Facades/Teams.php
@@ -22,4 +22,4 @@ protected static function getFacadeAccessor(): string
     {
         return TeamsService::class;
     }
-}
+}
diff --git a/src/Support/Services/TeamsService.php b/src/Support/Services/TeamsService.php
@@ -60,6 +60,6 @@ private function getModel(string $key, bool $instance = false): string|object
             throw new \RuntimeException("Model class for key $key not found.");
         }
 
-        return $instance ? new $modelClass : $modelClass;
+        return $instance ? new $modelClass() : $modelClass;
     }
-}
+}
diff --git a/src/TeamsServiceProvider.php b/src/TeamsServiceProvider.php
@@ -39,7 +39,7 @@ public function boot(): void
         $this->registerFacades();
         $this->registerMiddlewares();
 
-        if(Config::get('teams.invitations.enabled') && Config::get('teams.invitations.routes.register')) {
+        if (Config::get('teams.invitations.enabled') && Config::get('teams.invitations.routes.register')) {
             $this->registerRoutes();
         }
     }
@@ -65,7 +65,7 @@ protected function configurePublishing(): void
             __DIR__ . '/../database/migrations/create_entity_permission_table.php' => database_path('migrations/2019_12_14_000010_create_entity_permission_table.php'),
         ];
 
-        if(Config::get('teams.invitations.enabled')) {
+        if (Config::get('teams.invitations.enabled')) {
             $migrations[__DIR__ . '/../database/migrations/create_invitations_table.php'] = database_path('migrations/2019_12_14_000012_create_invitations_table.php');
         }
 
@@ -100,7 +100,7 @@ protected function configureCommands(): void
     protected function registerFacades(): void
     {
         $this->app->singleton('teams', static function () {
-            return new TeamsService;
+            return new TeamsService();
         });
     }
 
diff --git a/src/Traits/HasMembers.php b/src/Traits/HasMembers.php
@@ -48,7 +48,7 @@ public function users(): BelongsToMany
      */
     public function abilities(): HasMany
     {
-        return $this->hasMany(Teams::model('ability'), Config::get('teams.foreign_keys.team_id', 'team_id'),'id');
+        return $this->hasMany(Teams::model('ability'), Config::get('teams.foreign_keys.team_id', 'team_id'), 'id');
     }
 
     /**
@@ -58,7 +58,7 @@ public function abilities(): HasMany
      */
     public function roles(): HasMany
     {
-        return $this->hasMany(Teams::model('role'), Config::get('teams.foreign_keys.team_id', 'team_id'),'id');
+        return $this->hasMany(Teams::model('role'), Config::get('teams.foreign_keys.team_id', 'team_id'), 'id');
     }
 
     /**
@@ -68,7 +68,7 @@ public function roles(): HasMany
      */
     public function groups(): HasMany
     {
-        return $this->hasMany(Teams::model('group'), Config::get('teams.foreign_keys.team_id', 'team_id'),'id');
+        return $this->hasMany(Teams::model('group'), Config::get('teams.foreign_keys.team_id', 'team_id'), 'id');
     }
 
     /**
@@ -78,7 +78,7 @@ public function groups(): HasMany
      */
     public function invitations(): HasMany
     {
-        return $this->hasMany(Teams::model('invitation'), Config::get('teams.foreign_keys.team_id', 'team_id'),'id');
+        return $this->hasMany(Teams::model('invitation'), Config::get('teams.foreign_keys.team_id', 'team_id'), 'id');
     }
 
     /**
@@ -198,7 +198,7 @@ public function deleteUser(object $user): void
      */
     public function hasUserWithEmail(string $email): bool
     {
-        return $this->allUsers()->contains(fn($user) => $user->email === $email);
+        return $this->allUsers()->contains(fn ($user) => $user->email === $email);
     }
 
     /**
@@ -209,7 +209,7 @@ public function hasUserWithEmail(string $email): bool
      */
     public function userRole(object $user): object|null
     {
-        return $this->owner === $user ? new Owner : $this->getRole($this->users->firstWhere('id', $user->id)->membership->role->id ?? null);
+        return $this->owner === $user ? new Owner() : $this->getRole($this->users->firstWhere('id', $user->id)->membership->role->id ?? null);
     }
 
     /**
@@ -447,7 +447,7 @@ public function getPermissionIds(array $codes): array
 
         if (!empty($newPermissions)) {
 
-            $items = array_map(fn($code) => [$teamIdField => $this->id ,'code' => $code], $newPermissions);
+            $items = array_map(fn ($code) => [$teamIdField => $this->id ,'code' => $code], $newPermissions);
 
             Teams::model('permission')::query()->insert($items);
 
diff --git a/src/Traits/HasTeams.php b/src/Traits/HasTeams.php
diff --git a/stubs/app/Controllers/InviteController.php b/stubs/app/Controllers/InviteController.php
diff --git a/stubs/app/Policies/TeamPolicy.php b/stubs/app/Policies/TeamPolicy.php

Original file line number	Diff line number	Diff line change
`@@ -86,4 +86,4 @@`
`86`	`86`	`'middleware' => 'web'`
`87`	`87`	`]`
`88`	`88`	`],`
`89`		`-];`
	`89`	`+];`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@`
`5`	`5`	`use Illuminate\Support\Facades\Config;`
`6`	`6`	`use Illuminate\Support\Facades\Schema;`
`7`	`7`
`8`		`-return new class extends Migration`
`9`		`-{`
	`8`	`+return new class () extends Migration {`
`10`	`9`	`/**`
`11`	`10`	`* Run the migrations.`
`12`	`11`	`*/`
`@@ -30,4 +29,4 @@ public function down(): void`
`30`	`29`	`{`
`31`	`30`	`Schema::dropIfExists('team_user');`
`32`	`31`	`}`
`33`		`-};`
	`32`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@`
`8`	`8`
`9`	`9`	`abstract class TeamEvent`
`10`	`10`	`{`
`11`		`- use Dispatchable, InteractsWithSockets, SerializesModels;`
	`11`	`+ use Dispatchable;`
	`12`	`+ use InteractsWithSockets;`
	`13`	`+ use SerializesModels;`
`12`	`14`
`13`	`15`	`/**`
`14`	`16`	`* The team instance.`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@`
`10`	`10`
`11`	`11`	`class Invitation extends Mailable`
`12`	`12`	`{`
`13`		`- use Queueable, SerializesModels;`
	`13`	`+ use Queueable;`
	`14`	`+ use SerializesModels;`
`14`	`15`
`15`	`16`	`/**`
`16`	`17`	`* The team invitation instance.`
`@@ -38,4 +39,4 @@ public function build(): static`
`38`	`39`	`'invitation' => $this->invitation,`
`39`	`40`	`])])->subject(__('Team Invitation'));`
`40`	`41`	`}`
`41`		`-}`
	`42`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`	`class Ability extends Teams`
`9`	`9`	`{`
`10`		`-`
`11`	`10`	`/**`
`12`	`11`	`* Handle incoming request.`
`13`	`12`	`*`
`@@ -25,4 +24,4 @@ public function handle(Request $request, Closure $next, string $ability, ...$mod`
`25`	`24`
`26`	`25`	`return $next($request);`
`27`	`26`	`}`
`28`		`-}`
	`27`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`	`class Permission extends Teams`
`9`	`9`	`{`
`10`		`-`
`11`	`10`	`/**`
`12`	`11`	`* Handle incoming request.`
`13`	`12`	`*`
`@@ -26,4 +25,4 @@ public function handle(Request $request, Closure $next, string\|array $permission`
`26`	`25`
`27`	`26`	`return $next($request);`
`28`	`27`	`}`
`29`		`-}`
	`28`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`
`13`	`13`	`class Teams`
`14`	`14`	`{`
`15`		`-`
`16`	`15`	`/**`
`17`	`16`	`* Check if the request has authorization to continue.`
`18`	`17`	`*`
`@@ -122,7 +121,7 @@ protected function getGateArguments(Request $request, ?array $models): array`
`122`	`121`	`}`
`123`	`122`
`124`	`123`	`// Filter out invalid model instances and fetch actual model instances`
`125`		`- return array_map(fn($model) => $model instanceof Model ? $model : $this->getModel($request, $model), $models);`
	`124`	`+ return array_map(fn ($model) => $model instanceof Model ? $model : $this->getModel($request, $model), $models);`
`126`	`125`	`}`
`127`	`126`
`128`	`127`	`/**`
`@@ -145,4 +144,4 @@ protected function getModel(Request $request, string $model): string`
`145`	`144`	`// Otherwise, retrieve the model from the request route, falling back to the original model name`
`146`	`145`	`return $request->route($trimmedModel) ?: $trimmedModel;`
`147`	`146`	`}`
`148`		`-}`
	`147`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,4 @@ public function roles(): MorphToMany`
`63`	`63`	`->withPivot('forbidden')`
`64`	`64`	`->withTimestamps();`
`65`	`65`	`}`
`66`		`-}`
	`66`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,4 @@ public function roles(): MorphToMany`
`44`	`44`	`{`
`45`	`45`	`return $this->morphedByMany(Teams::model('role'), 'entity', 'entity_permission');`
`46`	`46`	`}`
`47`		`-}`
	`47`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,4 @@ public function __construct(array $attributes = [])`
`34`	`34`	`parent::__construct($attributes);`
`35`	`35`	`$this->table = Config::get('teams.tables.teams', 'teams');`
`36`	`36`	`}`
`37`		`-}`
	`37`	`+}`