From eeb633ac6d4105f525ef1bc237040ce413109af0 Mon Sep 17 00:00:00 2001 From: Ash Monsh Date: Wed, 2 Oct 2024 17:40:49 +0300 Subject: [PATCH] refactor routeNamePrefix to core trait --- composer.lock | 65 +++++++++++++++++++++---------------------- src/Configuration.php | 14 ---------- src/SkyPlugin.php | 2 ++ 3 files changed, 34 insertions(+), 47 deletions(-) diff --git a/composer.lock b/composer.lock index 5cbba98..df6c337 100644 --- a/composer.lock +++ b/composer.lock @@ -2269,16 +2269,16 @@ }, { "name": "lara-zeus/core", - "version": "v3.1.10", + "version": "v3.1.11", "source": { "type": "git", "url": "https://github.com/lara-zeus/core.git", - "reference": "07e22cc9a761848b5d88430b6fd67086c42c9987" + "reference": "c3a6127e0675dada44ba2a394d09cb49ec55c30c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lara-zeus/core/zipball/07e22cc9a761848b5d88430b6fd67086c42c9987", - "reference": "07e22cc9a761848b5d88430b6fd67086c42c9987", + "url": "https://api.github.com/repos/lara-zeus/core/zipball/c3a6127e0675dada44ba2a394d09cb49ec55c30c", + "reference": "c3a6127e0675dada44ba2a394d09cb49ec55c30c", "shasum": "" }, "require": { @@ -2328,9 +2328,8 @@ ], "authors": [ { - "name": "php coder", - "email": "info@larazeus.com", - "role": "Owner" + "name": "Lara Zeus (Ash)", + "email": "info@larazeus.com" } ], "description": "the core for zeus packages", @@ -2352,7 +2351,7 @@ "type": "github" } ], - "time": "2024-08-02T08:43:24+00:00" + "time": "2024-10-02T14:32:22+00:00" }, { "name": "laravel/framework", @@ -2958,16 +2957,16 @@ }, { "name": "league/flysystem", - "version": "3.28.0", + "version": "3.29.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c" + "reference": "0adc0d9a51852e170e0028a60bd271726626d3f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c", - "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0adc0d9a51852e170e0028a60bd271726626d3f0", + "reference": "0adc0d9a51852e170e0028a60bd271726626d3f0", "shasum": "" }, "require": { @@ -3035,22 +3034,22 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.28.0" + "source": "https://github.com/thephpleague/flysystem/tree/3.29.0" }, - "time": "2024-05-22T10:09:12+00:00" + "time": "2024-09-29T11:59:11+00:00" }, { "name": "league/flysystem-local", - "version": "3.28.0", + "version": "3.29.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-local.git", - "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40" + "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/13f22ea8be526ea58c2ddff9e158ef7c296e4f40", - "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40", + "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/e0e8d52ce4b2ed154148453d321e97c8e931bd27", + "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27", "shasum": "" }, "require": { @@ -3084,9 +3083,9 @@ "local" ], "support": { - "source": "https://github.com/thephpleague/flysystem-local/tree/3.28.0" + "source": "https://github.com/thephpleague/flysystem-local/tree/3.29.0" }, - "time": "2024-05-06T20:05:52+00:00" + "time": "2024-08-09T21:24:39+00:00" }, { "name": "league/mime-type-detection", @@ -3320,16 +3319,16 @@ }, { "name": "livewire/livewire", - "version": "v3.5.8", + "version": "v3.5.9", "source": { "type": "git", "url": "https://github.com/livewire/livewire.git", - "reference": "ce1ce71b39a3492b98f7d2f2a4583f1b163fe6ae" + "reference": "d04a229058afa76116d0e39209943a8ea3a7f888" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/livewire/livewire/zipball/ce1ce71b39a3492b98f7d2f2a4583f1b163fe6ae", - "reference": "ce1ce71b39a3492b98f7d2f2a4583f1b163fe6ae", + "url": "https://api.github.com/repos/livewire/livewire/zipball/d04a229058afa76116d0e39209943a8ea3a7f888", + "reference": "d04a229058afa76116d0e39209943a8ea3a7f888", "shasum": "" }, "require": { @@ -3337,7 +3336,7 @@ "illuminate/routing": "^10.0|^11.0", "illuminate/support": "^10.0|^11.0", "illuminate/validation": "^10.0|^11.0", - "laravel/prompts": "^0.1.24", + "laravel/prompts": "^0.1.24|^0.2|^0.3", "league/mime-type-detection": "^1.9", "php": "^8.1", "symfony/console": "^6.0|^7.0", @@ -3384,7 +3383,7 @@ "description": "A front-end framework for Laravel.", "support": { "issues": "https://github.com/livewire/livewire/issues", - "source": "https://github.com/livewire/livewire/tree/v3.5.8" + "source": "https://github.com/livewire/livewire/tree/v3.5.9" }, "funding": [ { @@ -3392,7 +3391,7 @@ "type": "github" } ], - "time": "2024-09-20T19:41:19+00:00" + "time": "2024-10-01T12:40:06+00:00" }, { "name": "maennchen/zipstream-php", @@ -8973,16 +8972,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.2.0", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb" + "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb", - "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3abf7425cd284141dc5d8d14a9ee444de3345d1a", + "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a", "shasum": "" }, "require": { @@ -9025,9 +9024,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.2.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.0" }, - "time": "2024-09-15T16:40:33+00:00" + "time": "2024-09-29T13:56:26+00:00" }, { "name": "nunomaduro/collision", diff --git a/src/Configuration.php b/src/Configuration.php index dd77c03..3ee6c42 100644 --- a/src/Configuration.php +++ b/src/Configuration.php @@ -57,8 +57,6 @@ trait Configuration protected array | Closure $extraFields = []; - protected Closure | string | null $routeNamePrefix = null; - public function navigationGroupLabel(Closure | string $lable): static { $this->navigationGroupLabel = $lable; @@ -281,16 +279,4 @@ public function hideResources(array $resources = []): static return $this; } - - public function routeNamePrefix(Closure | string | null $prefix): static - { - $this->routeNamePrefix = $prefix; - - return $this; - } - - public function getRouteNamePrefix(): Closure | string | null - { - return $this->evaluate($this->routeNamePrefix); - } } diff --git a/src/SkyPlugin.php b/src/SkyPlugin.php index d6b1cc5..6a5de74 100644 --- a/src/SkyPlugin.php +++ b/src/SkyPlugin.php @@ -5,6 +5,7 @@ use Filament\Contracts\Plugin; use Filament\Panel; use Filament\Support\Concerns\EvaluatesClosures; +use LaraZeus\Core\Concerns\HasRouteNamePrefix; use LaraZeus\Sky\Filament\Resources\FaqResource; use LaraZeus\Sky\Filament\Resources\LibraryResource; use LaraZeus\Sky\Filament\Resources\NavigationResource; @@ -16,6 +17,7 @@ final class SkyPlugin implements Plugin { use Configuration; use EvaluatesClosures; + use HasRouteNamePrefix; public function getId(): string {