Refactor package name usage

sten · sten · commit df72caa7cd4a · 2025-08-19T16:12:16.000+02:00
diff --git a/src/Components/BaseLayout.php b/src/Components/BaseLayout.php
@@ -4,13 +4,14 @@
 
 use Illuminate\View\Component;
 use Statikbe\FilamentFlexibleContentBlockPages\Facades\FilamentFlexibleContentBlockPages;
+use Statikbe\FilamentFlexibleContentBlockPages\FilamentFlexibleContentBlockPagesServiceProvider;
 
 class BaseLayout extends Component
 {
     public function render()
     {
         $theme = FilamentFlexibleContentBlockPages::config()->getTheme();
 
-        return view("filament-flexible-content-block-pages::{$theme}.components.layouts.base");
+        return flexiblePagesView("{$theme}.components.layouts.base");
     }
 }
diff --git a/src/Components/LanguageSwitch.php b/src/Components/LanguageSwitch.php
@@ -5,13 +5,15 @@
 use Illuminate\View\Component;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 use Statikbe\FilamentFlexibleContentBlockPages\Facades\FilamentFlexibleContentBlockPages;
+use Statikbe\FilamentFlexibleContentBlockPages\FilamentFlexibleContentBlockPagesServiceProvider;
 
 class LanguageSwitch extends Component
 {
     public function render()
     {
         $theme = FilamentFlexibleContentBlockPages::config()->getTheme();
-        $template = "filament-flexible-content-block-pages::{$theme}.components.language-switch";
+        $package = FilamentFlexibleContentBlockPagesServiceProvider::PACKAGE_PREFIX;
+        $template = "{$package}::{$theme}.components.language-switch";
 
         // Check if the themed template exists, otherwise fallback to tailwind theme
         if (view()->exists($template)) {
@@ -20,7 +22,7 @@ public function render()
 
         // Final fallback to tailwind theme
         /** @var view-string $fallbackTemplate */
-        $fallbackTemplate = 'filament-flexible-content-block-pages::tailwind.components.language-switch';
+        $fallbackTemplate = "{$package}::tailwind.components.language-switch";
 
         return view($fallbackTemplate);
     }
diff --git a/src/Components/Menu.php b/src/Components/Menu.php
@@ -4,6 +4,7 @@
 
 use Illuminate\View\Component;
 use Statikbe\FilamentFlexibleContentBlockPages\Facades\FilamentFlexibleContentBlockPages;
+use Statikbe\FilamentFlexibleContentBlockPages\FilamentFlexibleContentBlockPagesServiceProvider;
 
 class Menu extends Component
 {
@@ -38,14 +39,15 @@ public function __construct(
     public function render()
     {
         $theme = FilamentFlexibleContentBlockPages::config()->getTheme();
-        $template = "filament-flexible-content-block-pages::{$theme}.components.menu.{$this->style}";
+        $package = FilamentFlexibleContentBlockPagesServiceProvider::PACKAGE_PREFIX;
+        $template = "$package::{$theme}.components.menu.{$this->style}";
 
         // Check if the themed style template exists, otherwise try default style in theme
         if (view()->exists($template)) {
             return view($template);
         }
 
-        $defaultTemplate = "filament-flexible-content-block-pages::{$theme}.components.menu.default";
+        $defaultTemplate = "{$package}::{$theme}.components.menu.default";
 
         return view($defaultTemplate);
     }
diff --git a/src/Components/MenuItem.php b/src/Components/MenuItem.php
@@ -4,6 +4,7 @@
 
 use Illuminate\View\Component;
 use Statikbe\FilamentFlexibleContentBlockPages\Facades\FilamentFlexibleContentBlockPages;
+use Statikbe\FilamentFlexibleContentBlockPages\FilamentFlexibleContentBlockPagesServiceProvider;
 use Statikbe\FilamentFlexibleContentBlockPages\Models\MenuItem as MenuItemModel;
 
 class MenuItem extends Component
@@ -27,14 +28,15 @@ public function __construct(
     public function render()
     {
         $theme = FilamentFlexibleContentBlockPages::config()->getTheme();
-        $template = "filament-flexible-content-block-pages::{$theme}.components.menu.{$this->style}-item";
+        $package = FilamentFlexibleContentBlockPagesServiceProvider::PACKAGE_PREFIX;
+        $template = "{$package}::{$theme}.components.menu.{$this->style}-item";
 
         // Check if the themed style item template exists, otherwise try default item in theme
         if (view()->exists($template)) {
             return view($template);
         }
 
-        $defaultTemplate = "filament-flexible-content-block-pages::{$theme}.components.menu.default-item";
+        $defaultTemplate = "{$package}::{$theme}.components.menu.default-item";
 
         return view($defaultTemplate);
     }
diff --git a/src/Database/Seeders/MenuSeeder.php b/src/Database/Seeders/MenuSeeder.php
@@ -7,6 +7,7 @@
 use Illuminate\Support\Facades\Route;
 use InvalidArgumentException;
 use Statikbe\FilamentFlexibleContentBlockPages\Facades\FilamentFlexibleContentBlockPages;
+use Statikbe\FilamentFlexibleContentBlockPages\FilamentFlexibleContentBlockPagesServiceProvider;
 use Statikbe\FilamentFlexibleContentBlockPages\Models\Contracts\HasMenuLabel;
 use Statikbe\FilamentFlexibleContentBlockPages\Models\Menu;
 use Statikbe\FilamentFlexibleContentBlockPages\Models\MenuItem;
@@ -141,7 +142,7 @@ protected function createMenuItemForPageCode(
             menu: $menu,
             model: $model,
             label: $label,
-            link_type: 'filament-flexible-content-block-pages::page',
+            link_type: FilamentFlexibleContentBlockPagesServiceProvider::PACKAGE_PREFIX.'::page',
             useModelTitle: $useModelTitle,
             isVisible: $isVisible,
             target: $target,
diff --git a/src/FilamentFlexibleContentBlockPagesConfig.php b/src/FilamentFlexibleContentBlockPagesConfig.php
@@ -390,6 +390,6 @@ public function getTagPageRoutePrefix(): string
 
     private function packageConfig(string $configKey, $default = null): mixed
     {
-        return config('filament-flexible-content-block-pages.'.$configKey, $default);
+        return config(FilamentFlexibleContentBlockPagesServiceProvider::PACKAGE_PREFIX.'.'.$configKey, $default);
     }
 }
diff --git a/src/FilamentFlexibleContentBlockPagesServiceProvider.php b/src/FilamentFlexibleContentBlockPagesServiceProvider.php
@@ -21,15 +21,12 @@
 
 class FilamentFlexibleContentBlockPagesServiceProvider extends PackageServiceProvider
 {
+    const PACKAGE_PREFIX = 'filament-flexible-content-block-pages';
+
     public function configurePackage(Package $package): void
     {
-        /*
-         * This class is a Package Service Provider
-         *
-         * More info: https://github.com/spatie/laravel-package-tools
-         */
         $package
-            ->name('laravel-filament-flexible-content-block-pages')
+            ->name('laravel-'.self::PACKAGE_PREFIX)
             ->hasConfigFile()
             ->hasViews()
             ->hasMigrations([
diff --git a/src/FlexibleContentBlockPagesPlugin.php b/src/FlexibleContentBlockPagesPlugin.php
@@ -19,7 +19,7 @@ final class FlexibleContentBlockPagesPlugin implements Plugin
 
     public function getId(): string
     {
-        return 'filament-flexible-content-block-pages';
+        return FilamentFlexibleContentBlockPagesServiceProvider::PACKAGE_PREFIX;
     }
 
     public function register(Panel $panel): void
diff --git a/src/Http/Controllers/AbstractSeoPageController.php b/src/Http/Controllers/AbstractSeoPageController.php
@@ -15,7 +15,7 @@
 
 abstract class AbstractSeoPageController extends Controller
 {
-    const CACHE_SEO_IMAGE_DIMENSIONS = 'seo_image_dimensions:%s';
+    const CACHE_SEO_IMAGE_DIMENSIONS = 'filament-flexible-content-block-pages::seo_image_dimensions:%s';
 
     const CACHE_SEO_IMAGE_TTL = 60 * 60 * 8; // in seconds
 
diff --git a/src/Models/Menu.php b/src/Models/Menu.php
@@ -54,7 +54,7 @@ public function allMenuItems(): HasMany
 
     public function getMorphClass()
     {
-        return 'filament-flexible-content-block-pages::menu';
+        return flexiblePagesPrefix('menu');
     }
 
     public function getEffectiveStyle(): string
diff --git a/src/Models/MenuItem.php b/src/Models/MenuItem.php
@@ -94,7 +94,7 @@ public function parent()
 
     public function getMorphClass()
     {
-        return 'filament-flexible-content-block-pages::menu-item';
+        return flexiblePagesPrefix('menu-item');
     }
 
     public function getUrl(?string $locale = null): ?string
diff --git a/src/Models/Page.php b/src/Models/Page.php
@@ -97,6 +97,6 @@ public function isDeletable(): bool
 
     public function getMorphClass()
     {
-        return 'filament-flexible-content-block-pages::page';
+        return flexiblePagesPrefix('page');
     }
 }
diff --git a/src/Models/Redirect.php b/src/Models/Redirect.php
@@ -30,6 +30,6 @@ public function getTable()
 
     public function getMorphClass()
     {
-        return 'filament-flexible-content-block-pages::redirect';
+        return flexiblePagesPrefix('redirect');
     }
 }
diff --git a/src/Models/Settings.php b/src/Models/Settings.php
@@ -85,7 +85,7 @@ public static function setting(string $settingField, ?string $locale = null): st
             $locale = app()->getLocale();
         }
 
-        $cacheKey = "filament-flexible-content-block-pages::settings::setting__{$settingField}_{$locale}";
+        $cacheKey = static::CACHE_TAG_SETTINGS."::setting__{$settingField}_{$locale}";
         $settingValue = TaggableCache::rememberForeverWithTag(
             static::CACHE_TAG_SETTINGS,
             $cacheKey,
@@ -116,7 +116,7 @@ public static function imageHtml(string $imageCollection, ?string $imageConversi
 
         $imageMedia = TaggableCache::rememberForeverWithTag(
             static::CACHE_TAG_SETTINGS,
-            "filament-flexible-content-block-pages::settings::image_media__{$imageCollection}__{$locale}",
+            static::CACHE_TAG_SETTINGS."::image_media__{$imageCollection}__{$locale}",
             function () use ($imageCollection): ?Media {
                 return static::getSettings()->getImageMedia($imageCollection);
             });
@@ -143,7 +143,7 @@ public static function imageUrl(string $imageCollection, ?string $imageConversio
 
         return TaggableCache::rememberForeverWithTag(
             static::CACHE_TAG_SETTINGS,
-            "filament-flexible-content-block-pages::settings::image_url__{$imageCollection}__{$imageConversion}",
+            static::CACHE_TAG_SETTINGS."::image_url__{$imageCollection}__{$imageConversion}",
             function () use ($imageCollection, $imageConversion) {
                 return static::getSettings()->getImageUrl($imageCollection, $imageConversion);
             });
@@ -176,6 +176,6 @@ public function defaultSeoImage(): MorphMany
 
     public function getMorphClass()
     {
-        return 'filament-flexible-content-block-pages::settings';
+        return flexiblePagesPrefix('settings');
     }
 }
diff --git a/src/Models/Tag.php b/src/Models/Tag.php
@@ -79,6 +79,6 @@ public function getPreviewUrl(?string $locale = null): string
 
     public function getMorphClass()
     {
-        return 'filament-flexible-content-block-pages::tag';
+        return flexiblePagesPrefix('tag');
     }
 }
diff --git a/src/Models/TagType.php b/src/Models/TagType.php
@@ -103,6 +103,6 @@ public function hasSvgIcon(): bool
 
     public function getMorphClass()
     {
-        return 'filament-flexible-content-block-pages::tag_type';
+        return flexiblePagesPrefix('tag_type');
     }
 }
diff --git a/src/helpers.php b/src/helpers.php
@@ -1,6 +1,7 @@
 <?php
 
 use Statikbe\FilamentFlexibleContentBlockPages\Facades\FilamentFlexibleContentBlockPages;
+use Statikbe\FilamentFlexibleContentBlockPages\FilamentFlexibleContentBlockPagesServiceProvider;
 
 function flexiblePagesTrans(string $translationKey, array $replace = [], ?string $locale = null): string
 {
@@ -16,3 +17,17 @@ function flexiblePagesSettingImageUrl(string $imageCollection, ?string $imageCon
 {
     return FilamentFlexibleContentBlockPages::config()->getSettingsModel()::imageUrl($imageCollection, $imageConversion);
 }
+
+function flexiblePagesPrefix(string $var): string
+{
+    $package = FilamentFlexibleContentBlockPagesServiceProvider::PACKAGE_PREFIX;
+    return "{$package}::{$var}";
+}
+
+/**
+ * @return ($view is null ? \Illuminate\Contracts\View\Factory : \Illuminate\Contracts\View\View)
+ */
+function flexiblePagesView(string $viewPath, $data = [], $mergeData = []): string
+{
+    return view(flexiblePagesPrefix($viewPath));
+}

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,14 @@`
`4`	`4`
`5`	`5`	`use Illuminate\View\Component;`
`6`	`6`	`use Statikbe\FilamentFlexibleContentBlockPages\Facades\FilamentFlexibleContentBlockPages;`
	`7`	`+use Statikbe\FilamentFlexibleContentBlockPages\FilamentFlexibleContentBlockPagesServiceProvider;`
`7`	`8`
`8`	`9`	`class BaseLayout extends Component`
`9`	`10`	`{`
`10`	`11`	`public function render()`
`11`	`12`	`{`
`12`	`13`	`$theme = FilamentFlexibleContentBlockPages::config()->getTheme();`
`13`	`14`
`14`		`- return view("filament-flexible-content-block-pages::{$theme}.components.layouts.base");`
	`15`	`+ return flexiblePagesView("{$theme}.components.layouts.base");`
`15`	`16`	`}`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`use Illuminate\View\Component;`
`6`	`6`	`use Statikbe\FilamentFlexibleContentBlockPages\Facades\FilamentFlexibleContentBlockPages;`
	`7`	`+use Statikbe\FilamentFlexibleContentBlockPages\FilamentFlexibleContentBlockPagesServiceProvider;`
`7`	`8`
`8`	`9`	`class Menu extends Component`
`9`	`10`	`{`
`@@ -38,14 +39,15 @@ public function __construct(`
`38`	`39`	`public function render()`
`39`	`40`	`{`
`40`	`41`	`$theme = FilamentFlexibleContentBlockPages::config()->getTheme();`
`41`		`- $template = "filament-flexible-content-block-pages::{$theme}.components.menu.{$this->style}";`
	`42`	`+ $package = FilamentFlexibleContentBlockPagesServiceProvider::PACKAGE_PREFIX;`
	`43`	`+ $template = "$package::{$theme}.components.menu.{$this->style}";`
`42`	`44`
`43`	`45`	`// Check if the themed style template exists, otherwise try default style in theme`
`44`	`46`	`if (view()->exists($template)) {`
`45`	`47`	`return view($template);`
`46`	`48`	`}`
`47`	`49`
`48`		`- $defaultTemplate = "filament-flexible-content-block-pages::{$theme}.components.menu.default";`
	`50`	`+ $defaultTemplate = "{$package}::{$theme}.components.menu.default";`
`49`	`51`
`50`	`52`	`return view($defaultTemplate);`
`51`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -390,6 +390,6 @@ public function getTagPageRoutePrefix(): string`
`390`	`390`
`391`	`391`	`private function packageConfig(string $configKey, $default = null): mixed`
`392`	`392`	`{`
`393`		`- return config('filament-flexible-content-block-pages.'.$configKey, $default);`
	`393`	`+ return config(FilamentFlexibleContentBlockPagesServiceProvider::PACKAGE_PREFIX.'.'.$configKey, $default);`
`394`	`394`	`}`
`395`	`395`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ final class FlexibleContentBlockPagesPlugin implements Plugin`
`19`	`19`
`20`	`20`	`public function getId(): string`
`21`	`21`	`{`
`22`		`- return 'filament-flexible-content-block-pages';`
	`22`	`+ return FilamentFlexibleContentBlockPagesServiceProvider::PACKAGE_PREFIX;`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public function register(Panel $panel): void`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`abstract class AbstractSeoPageController extends Controller`
`17`	`17`	`{`
`18`		`- const CACHE_SEO_IMAGE_DIMENSIONS = 'seo_image_dimensions:%s';`
	`18`	`+ const CACHE_SEO_IMAGE_DIMENSIONS = 'filament-flexible-content-block-pages::seo_image_dimensions:%s';`
`19`	`19`
`20`	`20`	`const CACHE_SEO_IMAGE_TTL = 60 * 60 * 8; // in seconds`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function allMenuItems(): HasMany`
`54`	`54`
`55`	`55`	`public function getMorphClass()`
`56`	`56`	`{`
`57`		`- return 'filament-flexible-content-block-pages::menu';`
	`57`	`+ return flexiblePagesPrefix('menu');`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`public function getEffectiveStyle(): string`