Skip to content

Commit

Permalink
Merge 67730a6 into 7e73607
Browse files Browse the repository at this point in the history
  • Loading branch information
mostafamaklad committed Mar 12, 2018
2 parents 7e73607 + 67730a6 commit 9bbf8fb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/Guard.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ public static function getDefaultName($class): string
$default = config('auth.defaults.guard');
return static::getNames($class)->first() ?: $default;
}
}
}
4 changes: 2 additions & 2 deletions src/Traits/HasPermissions.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ protected function getStoredPermission($permission): Permission
*/
protected function ensureModelSharesGuard(Model $roleOrPermission)
{
if ( ! $this->getGuardNames()->contains($roleOrPermission->guard_name)) {
if (! $this->getGuardNames()->contains($roleOrPermission->guard_name)) {
$expected = $this->getGuardNames();
$given = $roleOrPermission->guard_name;
$helpers = new Helpers();
Expand Down Expand Up @@ -175,7 +175,7 @@ private function convertToPermissionModels($permissions): Collection
$permissions = collect($permissions);
}

if ( ! $permissions instanceof Collection) {
if (! $permissions instanceof Collection) {
$permissions = collect([$permissions]);
}

Expand Down

0 comments on commit 9bbf8fb

Please sign in to comment.