fix: phpstan

Z3d0X · Jan 11, 2024 · 4c529da · 4c529da
1 parent 809ff7e
commit 4c529da
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/src/Facades/FilamentFabricator.php b/src/Facades/FilamentFabricator.php
@@ -2,6 +2,7 @@
 
 namespace Z3d0X\FilamentFabricator\Facades;
 
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Facade;
 use Z3d0X\FilamentFabricator\Models\Contracts\Page as PageContract;
 
@@ -25,8 +26,8 @@
  * @method static array getScripts()
  * @method static array getStyles()
  * @method static ?string getFavicon()
- * @method static class-string<PageContract> getPageModel()
- * @method static string getRoutingPrefix()
+ * @method static class-string<PageContract&Model> getPageModel()
+ * @method static ?string getRoutingPrefix()
  * @method static array getPageUrls()
  * @method static ?string getPageUrlFromId(int $id, bool $prefixSlash = false)
  *

diff --git a/src/FilamentFabricatorManager.php b/src/FilamentFabricatorManager.php
@@ -4,7 +4,6 @@
 
 use Closure;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 use Z3d0X\FilamentFabricator\Layouts\Layout;
 use Z3d0X\FilamentFabricator\Models\Contracts\Page as PageContract;
@@ -189,6 +188,9 @@ public function getPageUrls(): array
 
     public function getPageUrlFromId(int $id, bool $prefixSlash = false, array $args = []): ?string
     {
-        return $this->getPageModel()::query()->find($id)?->getUrl($args);
+        /** @var ?PageContract $page */
+        $page = $this->getPageModel()::query()->find($id);
+
+        return $page?->getUrl($args);
     }
 }
diff --git a/src/Http/Controllers/PageController.php b/src/Http/Controllers/PageController.php
@@ -6,6 +6,7 @@
 use Z3d0X\FilamentFabricator\Facades\FilamentFabricator;
 use Z3d0X\FilamentFabricator\Layouts\Layout;
 use Z3d0X\FilamentFabricator\Models\Contracts\Page;
+use Z3d0X\FilamentFabricator\Services\PageRoutesService;
 
 class PageController
 {

diff --git a/src/Models/Concerns/HandlesPageUrls.php b/src/Models/Concerns/HandlesPageUrls.php
@@ -5,6 +5,7 @@
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 use Z3d0X\FilamentFabricator\Facades\FilamentFabricator;
+use Z3d0X\FilamentFabricator\Models\Contracts\Page;
 
 trait HandlesPageUrls {
     /**

diff --git a/src/Services/PageRoutesService.php b/src/Services/PageRoutesService.php
@@ -2,10 +2,11 @@
 
 namespace Z3d0X\FilamentFabricator\Services;
 
-use Z3d0X\FilamentFabricator\Facades\FilamentFabricator;
-use Z3d0X\FilamentFabricator\Models\Contracts\Page;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
+use Z3d0X\FilamentFabricator\Facades\FilamentFabricator;
+use Z3d0X\FilamentFabricator\Models\Contracts\Page;
 
 class PageRoutesService {
     protected const URI_TO_ID_MAPPING = 'filament-fabricator::PageRoutesService::uri-to-id';
@@ -31,6 +32,12 @@ public function getPageIdFromUri(string $uri): int
     public function getPageFromUri(string $uri): ?Page
     {
         $id = $this->getPageIdFromUri($uri);
+
+        if ($id === -1) {
+            return null;
+        }
+
+        /** @var Page&Model */
         return FilamentFabricator::getPageModel()::find($id);
     }
 
@@ -50,10 +57,12 @@ public function updateUrlsOf(Page $page): void
     /**
      * Get an instance of your Page model from a URI, or throw if there is none
      * @param string $uri
-     * @return Page
+     * @return Page&Model
      */
-    public function findPageOrFail(string $uri): Page {
+    public function findPageOrFail(string $uri): Page&Model {
         $id = $this->getPageIdFromUri($uri);
+
+        /** @var Page&Model */
         return FilamentFabricator::getPageModel()::findOrFail($id);
     }