Merge pull request #55 from mostafamaklad/v1.7

V1.7.1
mostafamaklad · Apr 7, 2018 · d37e741 · d37e741
2 parents 9683593 + e206f6f
commit d37e741
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -736,7 +736,7 @@ The MIT License (MIT). Please see [License File](LICENSE.md) for more informatio
 
 [link-packagist]: https://packagist.org/packages/mostafamaklad/laravel-permission-mongodb
 [ico-version]: https://img.shields.io/packagist/v/mostafamaklad/laravel-permission-mongodb.svg?style=flat-square
-[ico-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square
+[ico-license]: https://img.shields.io/packagist/l/mostafamaklad/laravel-permission-mongodb.svg?style=flat-square
 [ico-downloads]: https://img.shields.io/packagist/dt/mostafamaklad/laravel-permission-mongodb.svg?style=flat-square
 
 [link-laravel-5.2]: https://laravel.com/docs/5.2

diff --git a/src/Guard.php b/src/Guard.php
@@ -34,6 +34,9 @@ public function getNames($model) : Collection
         }
         return collect(config('auth.guards'))
             ->map(function ($guard) {
+                if (! isset($guard['provider'])) {
+                    return;
+                }
                 return config("auth.providers.{$guard['provider']}.model");
             })
             ->filter(function ($model) use ($class) {

diff --git a/src/Traits/HasRoles.php b/src/Traits/HasRoles.php
@@ -90,7 +90,7 @@ public function scopePermission(Builder $query, $permissions): Builder
      *
      * @param array|string|Role ...$roles
      *
-     * @return $this
+     * @return array|Role|string
      */
     public function assignRole(...$roles)
     {
@@ -108,15 +108,15 @@ public function assignRole(...$roles)
 
         $this->forgetCachedPermissions();
 
-        return $this;
+        return $roles;
     }
 
     /**
      * Revoke the given role from the model.
      *
      * @param array|string|Role ...$roles
      *
-     * @return HasRoles
+     * @return array|Role|string
      */
     public function removeRole(...$roles)
     {
@@ -131,7 +131,7 @@ public function removeRole(...$roles)
 
         $this->forgetCachedPermissions();
 
-        return $this;
+        return $roles;
     }
 
     /**

diff --git a/tests/MultipleGuardsTest.php b/tests/MultipleGuardsTest.php
@@ -30,6 +30,7 @@ protected function getEnvironmentSetUp($app)
         $app['config']->set('auth.guards', [
             'web' => ['driver' => 'session', 'provider' => 'users'],
             'api' => ['driver' => 'jwt', 'provider' => 'users'],
+            'abc' => ['driver' => 'abc'],
         ]);
     }
 }