Replace is_array with Arr::wrap (#1962)

Author: angeljqv

src/PermissionServiceProvider.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Routing\Route;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\View\Compilers\BladeCompiler;
@@ -152,23 +153,15 @@ protected function registerMacroHelpers()
         }
 
         Route::macro('role', function ($roles = []) {
-            if (! is_array($roles)) {
-                $roles = [$roles];
-            }
-
-            $roles = implode('|', $roles);
+            $roles = implode('|', Arr::wrap($roles));
 
             $this->middleware("role:$roles");
 
             return $this;
         });
 
         Route::macro('permission', function ($permissions = []) {
-            if (! is_array($permissions)) {
-                $permissions = [$permissions];
-            }
-
-            $permissions = implode('|', $permissions);
+            $permissions = implode('|', Arr::wrap($permissions));
 
             $this->middleware("permission:$permissions");
 

src/Traits/HasPermissions.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Spatie\Permission\Contracts\Permission;
 use Spatie\Permission\Contracts\Role;
@@ -103,16 +104,14 @@ protected function convertToPermissionModels($permissions): array
             $permissions = $permissions->all();
         }
 
-        $permissions = is_array($permissions) ? $permissions : [$permissions];
-
         return array_map(function ($permission) {
             if ($permission instanceof Permission) {
                 return $permission;
             }
             $method = is_string($permission) ? 'findByName' : 'findById';
 
             return $this->getPermissionClass()->{$method}($permission, $this->getDefaultGuardName());
-        }, $permissions);
+        }, Arr::wrap($permissions));
     }
 
     /**

src/Traits/HasRoles.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Spatie\Permission\Contracts\Permission;
 use Spatie\Permission\Contracts\Role;
@@ -75,10 +76,6 @@ public function scopeRole(Builder $query, $roles, $guard = null): Builder
             $roles = $roles->all();
         }
 
-        if (! is_array($roles)) {
-            $roles = [$roles];
-        }
-
         $roles = array_map(function ($role) use ($guard) {
             if ($role instanceof Role) {
                 return $role;
@@ -87,7 +84,7 @@ public function scopeRole(Builder $query, $roles, $guard = null): Builder
             $method = is_numeric($role) ? 'findById' : 'findByName';
 
             return $this->getRoleClass()->{$method}($role, $guard ?: $this->getDefaultGuardName());
-        }, $roles);
+        }, Arr::wrap($roles));
 
         return $query->whereHas('roles', function (Builder $subQuery) use ($roles) {
             $roleClass = $this->getRoleClass();