update helpers

httpoz · Nov 1, 2019 · d749ace · d749ace
1 parent 93a5ee2
commit d749ace
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
@@ -12,14 +12,17 @@
 */
 
 /** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use Illuminate\Support\Str;
+
 $factory->define( \HttpOz\Roles\Tests\Stubs\User::class, function ( Faker\Generator $faker ) {
 	static $password;
 
 	return [
 		'name'           => $faker->name,
 		'email'          => $faker->unique()->safeEmail,
 		'password'       => $password ?: $password = bcrypt( 'secret' ),
-		'remember_token' => str_random( 10 ),
+		'remember_token' => Str::random( 10 ),
 	];
 } );
 

diff --git a/src/Traits/HasRole.php b/src/Traits/HasRole.php
@@ -235,8 +235,8 @@ private function getArrayFrom( $argument ) {
 	 * @return mixed
 	 */
 	public function __call( $method, $parameters ) {
-		if ( starts_with( $method, 'is' ) ) {
-			return $this->isRole( snake_case( substr( $method, 2 ), config( 'roles.separator' ) ) );
+		if ( Str::startsWith( $method, 'is' ) ) {
+			return $this->isRole( Str::snake( substr( $method, 2 ), config( 'roles.separator' ) ) );
 		}
 
 		return parent::__call( $method, $parameters );

diff --git a/src/Traits/Sluggable.php b/src/Traits/Sluggable.php
@@ -2,6 +2,8 @@
 
 namespace HttpOz\Roles\Traits;
 
+use Illuminate\Support\Str;
+
 trait Sluggable
 {
     /**
@@ -13,12 +15,12 @@ trait Sluggable
 
     public function setSlugAttribute($value)
     {
-        $this->attributes['slug'] = str_slug($value, config('roles.separator'));
+        $this->attributes['slug'] = Str::slug($value, config('roles.separator'));
     }
 
     public function setGroupAttribute($value)
     {
-        $this->attributes['group'] = str_slug($value, config('roles.separator'));
+        $this->attributes['group'] = Str::slug($value, config('roles.separator'));
     }
 
 }