Remove deprecated Laravel helpers

caffeinated · Sep 6, 2019 · f3c438f · f3c438f
1 parent 2a4e2b5
commit f3c438f
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 12 deletions.
diff --git a/src/Concerns/HasPermissions.php b/src/Concerns/HasPermissions.php
@@ -2,6 +2,7 @@
 
 namespace Caffeinated\Shinobi\Concerns;
 
+use Illuminate\Support\Arr;
 use Caffeinated\Shinobi\Facades\Shinobi;
 use Caffeinated\Shinobi\Contracts\Permission;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -68,7 +69,7 @@ public function hasPermissionTo($permission): bool
      */
     public function givePermissionTo(...$permissions): self
     {        
-        $permissions = array_flatten($permissions);
+        $permissions = Arr::flatten($permissions);
         $permissions = $this->getPermissions($permissions);
 
         if (! $permissions) {
@@ -88,7 +89,7 @@ public function givePermissionTo(...$permissions): self
      */
     public function revokePermissionTo(...$permissions): self
     {
-        $permissions = array_flatten($permissions);
+        $permissions = Arr::flatten($permissions);
         $permissions = $this->getPermissions($permissions);
 
         $this->permissions()->detach($permissions);
@@ -104,7 +105,7 @@ public function revokePermissionTo(...$permissions): self
      */
     public function syncPermissions(...$permissions): self
     {
-        $permissions = array_flatten($permissions);
+        $permissions = Arr::flatten($permissions);
         $permissions = $this->getPermissions($permissions);
 
         $this->permissions()->sync($permissions);

diff --git a/src/Concerns/HasRoles.php b/src/Concerns/HasRoles.php
@@ -2,6 +2,8 @@
 
 namespace Caffeinated\Shinobi\Concerns;
 
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Caffeinated\Shinobi\Contracts\Role;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
@@ -25,7 +27,7 @@ public function roles(): BelongsToMany
      */
     public function hasRole($role): bool
     {
-        $slug = str_slug($role);
+        $slug = Str::slug($role);
 
         return (bool) $this->roles->where('slug', $slug)->count();
     }
@@ -77,7 +79,7 @@ public function hasRoles(): bool
      */
     public function assignRoles(...$roles): self
     {
-        $roles = array_flatten($roles);
+        $roles = Arr::flatten($roles);
         $roles = $this->getRoles($roles);
 
         if (! $roles) {
@@ -97,7 +99,7 @@ public function assignRoles(...$roles): self
      */
     public function removeRoles(...$roles): self
     {
-        $roles = array_flatten($roles);
+        $roles = Arr::flatten($roles);
         $roles = $this->getRoles($roles);
 
         $this->roles()->detach($roles);
@@ -113,7 +115,7 @@ public function removeRoles(...$roles): self
      */
     public function syncRoles(...$roles): self
     {
-        $roles = array_flatten($roles);
+        $roles = Arr::flatten($roles);
         $roles = $this->getRoles($roles);
 
         $this->roles()->sync($roles);

diff --git a/src/Tactics/AssignRoleTo.php b/src/Tactics/AssignRoleTo.php
@@ -2,6 +2,8 @@
 
 namespace Caffeinated\Shinobi\Tactics;
 
+use Illuminate\Support\Arr;
+
 class AssignRoleTo
 {
     /**
@@ -16,7 +18,7 @@ class AssignRoleTo
      */
     public function __construct(...$roles)
     {
-        $this->roles = array_flatten($roles);
+        $this->roles = Arr::flatten($roles);
     }
 
     public function to($user)

diff --git a/src/Tactics/GivePermissionTo.php b/src/Tactics/GivePermissionTo.php
@@ -2,6 +2,7 @@
 
 namespace Caffeinated\Shinobi\Tactics;
 
+use Illuminate\Support\Arr;
 use Illuminate\Database\Eloquent\Model;
 use Caffeinated\Shinobi\Facades\Shinobi;
 
@@ -19,7 +20,7 @@ class GivePermissionTo
      */
     public function __construct(...$permissions)
     {
-        $this->permissions = array_flatten($permissions);
+        $this->permissions = Arr::flatten($permissions);
     }
 
     /**

diff --git a/src/Tactics/RevokePermissionFrom.php b/src/Tactics/RevokePermissionFrom.php
@@ -2,6 +2,7 @@
 
 namespace Caffeinated\Shinobi\Tactics;
 
+use Illuminate\Support\Arr;
 use Illuminate\Database\Eloquent\Model;
 use Caffeinated\Shinobi\Facades\Shinobi;
 
@@ -19,7 +20,7 @@ class RevokePermissionsFrom
      */
     public function __construct(...$permissions)
     {
-        $this->permissions = array_flatten($permissions);
+        $this->permissions = Arr::flatten($permissions);
     }
 
     public function to($roleOrUser)

diff --git a/tests/factories/PermissionFactory.php b/tests/factories/PermissionFactory.php
@@ -1,13 +1,14 @@
 <?php
 
+use Illuminate\Support\Str;
 use Caffeinated\Shinobi\Models\Permission;
 
 $factory->define(Permission::class, function(Faker\Generator $faker) {
     $name = $faker->unique()->sentence(2);
 
     return [
         'name'        => $name,
-        'slug'        => str_slug($name, '.'),
+        'slug'        => Str::slug($name, '.'),
         'description' => $faker->sentence,
     ];
 });
diff --git a/tests/factories/RoleFactory.php b/tests/factories/RoleFactory.php
@@ -1,13 +1,14 @@
 <?php
 
+use Illuminate\Support\Str;
 use Caffeinated\Shinobi\Models\Role;
 
 $factory->define(Role::class, function(Faker\Generator $faker) {
     $name = $faker->unique()->jobTitle;
 
     return [
         'name'        => $name,
-        'slug'        => str_slug($name),
+        'slug'        => Str::slug($name),
         'description' => $faker->sentence,
         'special'     => null,
     ];