Skip to content

Commit 6f2f96f

Browse files
authored
Update Permission.php
1 parent 39bb908 commit 6f2f96f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/Models/Permission.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Permission extends Model implements PermissionContract
2626

2727
public function __construct(array $attributes = [])
2828
{
29-
$attributes['guard_name'] = $attributes['guard_name'] ?? config('auth.defaults.guard');
29+
$attributes['guard_name'] ??= Guard::getDefaultName(static::class);
3030

3131
parent::__construct($attributes);
3232

@@ -41,7 +41,7 @@ public function __construct(array $attributes = [])
4141
*/
4242
public static function create(array $attributes = [])
4343
{
44-
$attributes['guard_name'] = $attributes['guard_name'] ?? Guard::getDefaultName(static::class);
44+
$attributes['guard_name'] ??= Guard::getDefaultName(static::class);
4545

4646
$permission = static::getPermission(['name' => $attributes['name'], 'guard_name' => $attributes['guard_name']]);
4747

@@ -88,7 +88,7 @@ public function users(): BelongsToMany
8888
*/
8989
public static function findByName(string $name, ?string $guardName = null): PermissionContract
9090
{
91-
$guardName = $guardName ?? Guard::getDefaultName(static::class);
91+
$guardName ??= Guard::getDefaultName(static::class);
9292
$permission = static::getPermission(['name' => $name, 'guard_name' => $guardName]);
9393
if (! $permission) {
9494
throw PermissionDoesNotExist::create($name, $guardName);
@@ -106,7 +106,7 @@ public static function findByName(string $name, ?string $guardName = null): Perm
106106
*/
107107
public static function findById(int|string $id, ?string $guardName = null): PermissionContract
108108
{
109-
$guardName = $guardName ?? Guard::getDefaultName(static::class);
109+
$guardName ??= Guard::getDefaultName(static::class);
110110
$permission = static::getPermission([(new static)->getKeyName() => $id, 'guard_name' => $guardName]);
111111

112112
if (! $permission) {
@@ -123,7 +123,7 @@ public static function findById(int|string $id, ?string $guardName = null): Perm
123123
*/
124124
public static function findOrCreate(string $name, ?string $guardName = null): PermissionContract
125125
{
126-
$guardName = $guardName ?? Guard::getDefaultName(static::class);
126+
$guardName ??= Guard::getDefaultName(static::class);
127127
$permission = static::getPermission(['name' => $name, 'guard_name' => $guardName]);
128128

129129
if (! $permission) {

0 commit comments

Comments
 (0)