opensource/filament
3
0
Fork 0
mirror of https://github.com/filamentphp/filament.git synced 2026-09-24 15:42:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.x' of github.com:maherelgamil/filament into 2.x

Browse Source
This commit is contained in:
Maher El Gamil
2021-12-23 10:44:18 +02:00
parent f9fabffa3f dc9503265b
commit 6135bed5be
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/admin/src/Commands/Concerns/CanValidateInput.php
+2 -1
View File
@@ -2,6 +2,7 @@
namespace Filament\Commands\Concerns;
use Closure;
use Illuminate\Support\Facades\Validator;
trait CanValidateInput
@@ -11,7 +12,7 @@ trait CanValidateInput
return $this->validateInput(fn () => $this->ask($question), $field, ['required']);
}
protected function validateInput(callable $callback, string $field, array $rules): string
protected function validateInput(Closure $callback, string $field, array $rules): string
{
$input = $callback();
packages/admin/src/Facades/Filament.php
+2 -1
View File
@@ -2,6 +2,7 @@
namespace Filament\Facades;
use Closure;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Contracts\Auth\StatefulGuard;
use Illuminate\Support\Facades\Facade;
@@ -30,7 +31,7 @@ use Illuminate\Support\Facades\Facade;
* @method static void registerStyles(array $styles)
* @method static void registerTheme(string $url)
* @method static void registerWidgets(array $widgets)
* @method static void serving(callable $widgets)
* @method static void serving(Closure $callback)
*
* @see \Filament\FilamentManager
*/
packages/admin/src/FilamentManager.php
+2 -1
View File
@@ -2,6 +2,7 @@
namespace Filament;
use Closure;
use Filament\Events\ServingFilament;
use Filament\Models\Contracts\HasAvatar;
use Filament\Models\Contracts\HasName;
@@ -95,7 +96,7 @@ class FilamentManager
$this->widgets = array_merge($this->widgets, $widgets);
}
public function serving(callable $callback): void
public function serving(Closure $callback): void
{
Event::listen(ServingFilament::class, $callback);
}
packages/admin/src/Pages/Actions/Concerns/CanOpenUrl.php
+4 -2
View File
@@ -2,11 +2,13 @@
namespace Filament\Pages\Actions\Concerns;
use Closure;
trait CanOpenUrl
{
protected bool $shouldOpenUrlInNewTab = false;
protected $url = null;
protected string | Closure | null $url = null;
public function openUrlInNewTab(bool $condition = true): static
{
@@ -15,7 +17,7 @@ trait CanOpenUrl
return $this;
}
public function url(string | callable | null $url, bool $shouldOpenInNewTab = false): static
public function url(string | Closure | null $url, bool $shouldOpenInNewTab = false): static
{
$this->shouldOpenUrlInNewTab = $shouldOpenInNewTab;
$this->url = $url;