Use global helpers (#1963)

Author: angeljqv

src/Commands/CreateRole.php

@@ -21,8 +21,8 @@ public function handle()
     {
         $roleClass = app(RoleContract::class);
 
-        $teamIdAux = app(PermissionRegistrar::class)->getPermissionsTeamId();
-        app(PermissionRegistrar::class)->setPermissionsTeamId($this->option('team-id') ?: null);
+        $teamIdAux = getPermissionsTeamId();
+        setPermissionsTeamId($this->option('team-id') ?: null);
 
         if (! PermissionRegistrar::$teams && $this->option('team-id')) {
             $this->warn("Teams feature disabled, argument --team-id has no effect. Either enable it in permissions config file or remove --team-id parameter");
@@ -31,7 +31,7 @@ public function handle()
         }
 
         $role = $roleClass::findOrCreate($this->argument('name'), $this->argument('guard'));
-        app(PermissionRegistrar::class)->setPermissionsTeamId($teamIdAux);
+        setPermissionsTeamId($teamIdAux);
 
         $teams_key = PermissionRegistrar::$teamsKey;
         if (PermissionRegistrar::$teams && $this->option('team-id') && is_null($role->$teams_key)) {

src/Models/Role.php

@@ -43,7 +43,7 @@ public static function create(array $attributes = [])
             if (array_key_exists(PermissionRegistrar::$teamsKey, $attributes)) {
                 $params[PermissionRegistrar::$teamsKey] = $attributes[PermissionRegistrar::$teamsKey];
             } else {
-                $attributes[PermissionRegistrar::$teamsKey] = app(PermissionRegistrar::class)->getPermissionsTeamId();
+                $attributes[PermissionRegistrar::$teamsKey] = getPermissionsTeamId();
             }
         }
         if (static::findByParam($params)) {
@@ -131,21 +131,24 @@ public static function findOrCreate(string $name, $guardName = null): RoleContra
         $role = static::findByParam(['name' => $name, 'guard_name' => $guardName]);
 
         if (! $role) {
-            return static::query()->create(['name' => $name, 'guard_name' => $guardName] + (PermissionRegistrar::$teams ? [PermissionRegistrar::$teamsKey => app(PermissionRegistrar::class)->getPermissionsTeamId()] : []));
+            return static::query()->create(['name' => $name, 'guard_name' => $guardName] + (PermissionRegistrar::$teams ? [PermissionRegistrar::$teamsKey => getPermissionsTeamId()] : []));
         }
 
         return $role;
     }
 
     protected static function findByParam(array $params = [])
     {
-        $query = static::when(PermissionRegistrar::$teams, function ($q) use ($params) {
-            $q->where(function ($q) use ($params) {
+        $query = static::query();
+
+        if (PermissionRegistrar::$teams) {
+            $query->where(function ($q) use ($params) {
                 $q->whereNull(PermissionRegistrar::$teamsKey)
-                    ->orWhere(PermissionRegistrar::$teamsKey, $params[PermissionRegistrar::$teamsKey] ?? app(PermissionRegistrar::class)->getPermissionsTeamId());
+                    ->orWhere(PermissionRegistrar::$teamsKey, $params[PermissionRegistrar::$teamsKey] ?? getPermissionsTeamId());
             });
-        });
-        unset($params[PermissionRegistrar::$teamsKey]);
+            unset($params[PermissionRegistrar::$teamsKey]);
+        }
+        
         foreach ($params as $key => $value) {
             $query->where($key, $value);
         }