Fix bug in menu item page

Fix phpstan errors

Author: sten

src/FilamentFlexibleContentBlockPagesConfig.php

@@ -72,7 +72,8 @@ public function getSupportedLocales(): array
             return $flexibleBlocksLocales;
         }
 
-        return LaravelLocalization::getSupportedLanguagesKeys() ?? ['en'];
+        $supportedKeys = LaravelLocalization::getSupportedLanguagesKeys();
+        return !empty($supportedKeys) ? $supportedKeys : ['en'];
     }
 
     public function getPageModel(): Page

src/FilamentFlexibleContentBlockPagesServiceProvider.php

@@ -64,7 +64,7 @@ public function packageRegistered()
         $this->app->bind(
             \Statikbe\FilamentFlexibleContentBlockPages\Services\SitemapGeneratorService::class,
             function ($app) {
-                $serviceClass = FilamentFlexibleContentBlockPages::config()->getSitemapGeneratorService();
+                $serviceClass = \Statikbe\FilamentFlexibleContentBlockPages\Facades\FilamentFlexibleContentBlockPages::config()->getSitemapGeneratorService();
 
                 return $app->make($serviceClass);
             }

src/FlexibleContentBlockPagesPlugin.php

@@ -7,7 +7,7 @@
 use Filament\Resources\Resource;
 use Statikbe\FilamentFlexibleContentBlockPages\Facades\FilamentFlexibleContentBlockPages;
 
-class FlexibleContentBlockPagesPlugin implements Plugin
+final class FlexibleContentBlockPagesPlugin implements Plugin
 {
     protected static self $instance;
 
@@ -85,7 +85,7 @@ public static function getWidgets(): array
     }
 
     /**
-     * @param array<class-string<\Filament\Pages\Page>>
+     * @param array<class-string<\Filament\Pages\Page>> $pages
      */
     public static function pages(array $pages): static
     {
@@ -95,7 +95,7 @@ public static function pages(array $pages): static
     }
 
     /**
-     * @param array<class-string<\Filament\Widgets\Widget>>
+     * @param array<class-string<\Filament\Widgets\Widget>> $widgets
      */
     public static function widgets(array $widgets): static
     {

src/Resources/MenuResource/Pages/ManageMenuItems.php

@@ -4,6 +4,7 @@
 
 use Filament\Actions\CreateAction;
 use Filament\Facades\Filament;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\HtmlString;
 use SolutionForest\FilamentTree\Actions\DeleteAction;
@@ -41,6 +42,11 @@ public function getModel(): string
         return FilamentFlexibleContentBlockPages::config()->getMenuItemModel()::class;
     }
 
+    protected function getTreeQuery(): Builder
+    {
+        return $this->getModel()::query()->where('menu_id', $this->menu->id);
+    }
+
     public function getTitle(): string
     {
         return flexiblePagesTrans('menu_items.manage.title', [

src/Services/SitemapGeneratorService.php

@@ -13,6 +13,7 @@
 use Statikbe\FilamentFlexibleContentBlockPages\Facades\FilamentFlexibleContentBlockPages;
 use Statikbe\FilamentFlexibleContentBlockPages\Models\Page;
 use Statikbe\FilamentFlexibleContentBlockPages\Services\Enum\SitemapGeneratorMethod;
+use Statikbe\FilamentFlexibleContentBlocks\ContentBlocks\CallToActionBlock;
 use Statikbe\FilamentFlexibleContentBlocks\FilamentFlexibleBlocksConfig;
 use Statikbe\FilamentFlexibleContentBlocks\Models\Contracts\HasCode;
 use Statikbe\FilamentFlexibleContentBlocks\Models\Contracts\HasParent;
@@ -95,8 +96,10 @@ protected function addPageToSitemap(Page $page): void
         // Get canonical URL
         $canonicalUrl = $page->getViewUrl($this->canonicalLocale);
 
+        $lastModified = $page->{$page->getUpdatedAtColumn()} ?? $page->{$page->getCreatedAtColumn()};
+
         $urlTag = $this->addToSitemap($canonicalUrl,
-            $page->updated_at ?? $page->created_at,
+            $lastModified,
             $this->calculatePriority($page),
             $this->calculateChangeFrequency($page),
             onlyCreate: true);
@@ -183,8 +186,7 @@ protected function addCustomUrls(): void
 
     protected function getLinkableModels(): array
     {
-        // 'general' is just random block to trigger fetching the default configuration:
-        $ctaModels = FilamentFlexibleBlocksConfig::getCallToActionModels('general');
+        $ctaModels = FilamentFlexibleBlocksConfig::getCallToActionModels(CallToActionBlock::class);
         $menuModels = FilamentFlexibleContentBlockPages::config()->getMenuLinkableModels();
 
         // Merge and remove duplicates
@@ -194,12 +196,12 @@ protected function getLinkableModels(): array
     protected function calculatePriority(HasParent&HasCode $page): float
     {
         // Homepage gets highest priority
-        if ($page->code === Page::HOME_PAGE) {
+        if (property_exists($page, 'code') && $page->code === Page::HOME_PAGE) {
             return 1.0;
         }
 
         // Parent pages get higher priority than children
-        if (! $page->parent_id) {
+        if (property_exists($page, 'parent_id') && ! $page->parent_id) {
             return 0.8;
         }
 
@@ -209,7 +211,8 @@ protected function calculatePriority(HasParent&HasCode $page): float
 
     protected function calculateChangeFrequency(Model $page): string
     {
-        $daysSinceUpdate = $page->updated_at ? $page->updated_at->diffInDays(Carbon::now()) : 365;
+        $updatedAt = $page->{$page->getUpdatedAtColumn()};
+        $daysSinceUpdate = $updatedAt ? $updatedAt->diffInDays(Carbon::now()) : 365;
 
         if ($daysSinceUpdate < 7) {
             return Url::CHANGE_FREQUENCY_WEEKLY;