Skip to content

Commit

Permalink
fix phpstan
Browse files Browse the repository at this point in the history
Signed-off-by: Lloric Mayuga Garcia <[email protected]>
  • Loading branch information
lloricode committed Aug 25, 2024
1 parent da0c667 commit 72d0248
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/Config/PermissionConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static function roleNamesByGuardName(?string $guardName = null): array
/**
* @return array<string, string>
*/
public static function customPermissionsNames(): array
public static function customPermissionsNames(?string $guardName = null): array
{
$guardName ??= self::defaultGuardName();

Expand Down
6 changes: 3 additions & 3 deletions src/Database/Seeders/DefaultPermissionSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ protected function permissionsByGuard(): array
panels: $this->getPermissionsFromPanels(),
pages: $this->getPermissionsFromPages(),
widgets: $this->getPermissionsFromWidgets(),
customs: self::getCustomPermissionNames()
customs: self::getCustomPermissionNames(PermissionConfig::defaultGuardName())
),
];
}
Expand Down Expand Up @@ -121,9 +121,9 @@ private static function getPermissionsFromPages(): array
}

/** @return array<int, string> */
protected function getCustomPermissionNames(): array
protected function getCustomPermissionNames(string $guardName): array
{
$customs = collect(PermissionConfig::customPermissionsNames())
$customs = collect(PermissionConfig::customPermissionsNames($guardName))
->map(fn (string $custom) => FilamentPermissionGenerateName::getCustomPermissionName($custom));

if ($customs->isEmpty()) {
Expand Down
4 changes: 2 additions & 2 deletions src/FilamentPermissionGenerateName.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ public static function getWidgetPermissionName(HasPermissionWidgets | string $wi
return PermissionType::widgets->value . '.' . Str::of($widget)->classBasename()->camel();
}

public static function getCustomPermissionName(string $customPermissionName): string
public static function getCustomPermissionName(string $customPermissionName, ?string $guardName = null): string
{
if (! in_array($customPermissionName, PermissionConfig::customPermissionsNames(), true)) {
if (! in_array($customPermissionName, PermissionConfig::customPermissionsNames($guardName), true)) {
throw new \Exception('Custom permission [' . $customPermissionName . '] not found.');
}

Expand Down

0 comments on commit 72d0248

Please sign in to comment.