🆙 Add more fixes 🆙

This commit is contained in:
Remco
2026-02-02 20:56:28 +01:00
parent 0ca57c9a91
commit e6ed904f14
19 changed files with 1927 additions and 2302 deletions
@@ -19,11 +19,11 @@ class DateRangeFilter extends Filter
return $query
->when(
$data["{$name}_from"],
fn (Builder $query, $date) => $query->whereDate($name, '>=', $date),
fn (Builder $query, ?string $date) => $query->whereDate($name !== null ? $name : '', '>=', $date),
)
->when(
$data["{$name}_until"],
fn (Builder $query, $date) => $query->whereDate($name, '<=', $date),
fn (Builder $query, ?string $date) => $query->whereDate($name !== null ? $name : '', '<=', $date),
);
});
}
+7 -5
View File
@@ -34,9 +34,9 @@ class BadgePage extends Page
protected static string $translateIdentifier = 'badge-resource';
public $badgeWasPreviouslyCreated;
public bool $badgeWasPreviouslyCreated = false;
public ?array $data = [];
public array $data = [];
public static string $roleName = 'badge_page';
@@ -47,9 +47,11 @@ class BadgePage extends Page
public function getTitle(): string|Htmlable
{
return __(
$translated = __(
sprintf('filament::resources.resources.%s.navigation_label', static::$translateIdentifier),
);
return is_array($translated) ? (string) ($translated[0] ?? '') : (string) $translated;
}
public function form(Schema $schema): Schema
@@ -62,7 +64,7 @@ class BadgePage extends Page
->label(__('filament::resources.inputs.badge_code'))
->helperText(__('filament::resources.helpers.badge_code_helper'))
->afterStateUpdated(function (?string $state, Set $set) {
$set('code', strtoupper($state));
$set('code', strtoupper((string) $state));
})
->suffixAction(fn (): PageAction => PageAction::make('search')->icon('heroicon-o-magnifying-glass')->action(fn () => $this->searchBadgesByCode()),
),
@@ -131,7 +133,7 @@ class BadgePage extends Page
}
$badgeData = app(ExternalTextsParser::class)->getBadgeData($badgeCode);
$this->badgeWasPreviouslyCreated = is_array($badgeData['nitro']) || is_array($badgeData['flash']);
$this->badgeWasPreviouslyCreated = is_array($badgeData['nitro'] ?? null) || is_array($badgeData['flash'] ?? null);
if ($this->badgeWasPreviouslyCreated) {
Notification::make()
+2 -2
View File
@@ -14,7 +14,7 @@ use Illuminate\Validation\ValidationException;
class Login extends \Filament\Auth\Pages\Login
{
public $username = '';
public string $username = '';
public function authenticate(): ?LoginResponse
{
@@ -26,7 +26,7 @@ class Login extends \Filament\Auth\Pages\Login
'seconds' => $exception->secondsUntilAvailable,
'minutes' => ceil($exception->secondsUntilAvailable / 60),
]))
->body(array_key_exists('body', __('filament-panels::pages/auth/login.notifications.throttled') ?: []) ? __('filament-panels::pages/auth/login.notifications.throttled.body', [
->body(array_key_exists('body', (array) __('filament-panels::pages/auth/login.notifications.throttled') ?: []) ? __('filament-panels::pages/auth/login.notifications.throttled.body', [
'seconds' => $exception->secondsUntilAvailable,
'minutes' => ceil($exception->secondsUntilAvailable / 60),
]) : null)
@@ -81,7 +81,7 @@ class CmsSettingResource extends Resource
->tooltip(function (TextColumn $column): ?string {
$state = $column->getState();
if (strlen($state) <= $column->getCharacterLimit()) {
if (! is_string($state) || strlen($state) <= $column->getCharacterLimit()) {
return null;
}
@@ -80,7 +80,7 @@ class HousekeepingPermissionResource extends Resource
->tooltip(function (TextColumn $column): ?string {
$state = $column->getState();
if (strlen($state) <= $column->getCharacterLimit()) {
if (! is_string($state) || strlen($state) <= $column->getCharacterLimit()) {
return null;
}
@@ -12,32 +12,40 @@ trait TranslatableResource
return null;
}
return __(
$translated = __(
sprintf('filament::resources.navigations.%s', static::$navigationGroup),
);
return is_array($translated) ? (string) ($translated[0] ?? '') : (string) $translated;
}
public static function getPluralModelLabel(): string
{
return __(sprintf(
$translated = __(sprintf(
Str::endsWith(static::class, 'RelationManager')
? 'filament::resources.resources.%s.navigation_label'
: 'filament::resources.resources.%s.plural',
static::$translateIdentifier,
));
return is_array($translated) ? (string) ($translated[0] ?? '') : (string) $translated;
}
public static function getNavigationLabel(): string
{
return __(
$translated = __(
sprintf('filament::resources.resources.%s.navigation_label', static::$translateIdentifier),
);
return is_array($translated) ? (string) ($translated[0] ?? '') : (string) $translated;
}
public static function getModelLabel(): string
{
return __(
$translated = __(
sprintf('filament::resources.resources.%s.label', static::$translateIdentifier),
);
return is_array($translated) ? (string) ($translated[0] ?? '') : (string) $translated;
}
}