Skip to content

Commit 11b97be

Browse files
committed
Support strings as numeric ids
1 parent 62f22e1 commit 11b97be

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/Traits/HasPermissions.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ protected function convertToPermissionModels($permissions): array
152152
$permission = $permission->value;
153153
}
154154

155-
$method = is_int($permission) || PermissionRegistrar::isUid($permission) ? 'findById' : 'findByName';
155+
$method = is_numeric($permission) || PermissionRegistrar::isUid($permission) ? 'findById' : 'findByName';
156156

157157
return $this->getPermissionClass()::{$method}($permission, $this->getDefaultGuardName());
158158
}, Arr::wrap($permissions));
@@ -172,7 +172,7 @@ public function filterPermission($permission, $guardName = null)
172172
$permission = $permission->value;
173173
}
174174

175-
if (is_int($permission) || PermissionRegistrar::isUid($permission)) {
175+
if (is_numeric($permission) || PermissionRegistrar::isUid($permission)) {
176176
$permission = $this->getPermissionClass()::findById(
177177
$permission,
178178
$guardName ?? $this->getDefaultGuardName()
@@ -480,7 +480,7 @@ protected function getStoredPermission($permissions)
480480
$permissions = $permissions->value;
481481
}
482482

483-
if (is_int($permissions) || PermissionRegistrar::isUid($permissions)) {
483+
if (is_numeric($permissions) || PermissionRegistrar::isUid($permissions)) {
484484
return $this->getPermissionClass()::findById($permissions, $this->getDefaultGuardName());
485485
}
486486

src/Traits/HasRoles.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function scopeRole(Builder $query, $roles, $guard = null, $without = fals
8787
$role = $role->value;
8888
}
8989

90-
$method = is_int($role) || PermissionRegistrar::isUid($role) ? 'findById' : 'findByName';
90+
$method = is_numeric($role) || PermissionRegistrar::isUid($role) ? 'findById' : 'findByName';
9191

9292
return $this->getRoleClass()::{$method}($role, $guard ?: $this->getDefaultGuardName());
9393
}, Arr::wrap($roles));
@@ -229,7 +229,7 @@ public function hasRole($roles, string $guard = null): bool
229229
$roles = $roles->value;
230230
}
231231

232-
if (is_int($roles) || PermissionRegistrar::isUid($roles)) {
232+
if (is_numeric($roles) || PermissionRegistrar::isUid($roles)) {
233233
$key = (new ($this->getRoleClass())())->getKeyName();
234234

235235
return $guard
@@ -366,7 +366,7 @@ protected function getStoredRole($role): Role
366366
$role = $role->value;
367367
}
368368

369-
if (is_int($role) || PermissionRegistrar::isUid($role)) {
369+
if (is_numeric($role) || PermissionRegistrar::isUid($role)) {
370370
return $this->getRoleClass()::findById($role, $this->getDefaultGuardName());
371371
}
372372

0 commit comments

Comments
 (0)