Fix site map service binding + refactor

Author: sten

src/Commands/GenerateSitemapCommand.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Console\Command;
 use Statikbe\FilamentFlexibleContentBlockPages\Facades\FilamentFlexibleContentBlockPages;
+use Statikbe\FilamentFlexibleContentBlockPages\Services\Contracts\GeneratesSitemap;
 
 class GenerateSitemapCommand extends Command
 {
@@ -35,8 +36,7 @@ public function handle(): int
         $this->info('Generating sitemap...');
 
         try {
-            $generatorServiceClass = FilamentFlexibleContentBlockPages::config()->getSitemapGeneratorService();
-            $generator = app($generatorServiceClass);
+            $generator = app(GeneratesSitemap::class);
 
             $generator->generate();
 

src/FilamentFlexibleContentBlockPagesServiceProvider.php

@@ -15,6 +15,7 @@
 use Statikbe\FilamentFlexibleContentBlockPages\Components\Menu;
 use Statikbe\FilamentFlexibleContentBlockPages\Components\MenuItem;
 use Statikbe\FilamentFlexibleContentBlockPages\Listeners\SlugChangedListener;
+use Statikbe\FilamentFlexibleContentBlockPages\Services\Contracts\GeneratesSitemap;
 use Statikbe\FilamentFlexibleContentBlocks\Events\SlugChanged;
 use Statikbe\FilamentFlexibleContentBlocks\FilamentFlexibleContentBlocks;
 
@@ -68,13 +69,10 @@ public function packageBooted()
 
     public function packageRegistered()
     {
+        // Bind sitemap generator interface to the configured implementation
         $this->app->bind(
-            \Statikbe\FilamentFlexibleContentBlockPages\Services\SitemapGeneratorService::class,
-            function ($app) {
-                $serviceClass = \Statikbe\FilamentFlexibleContentBlockPages\Facades\FilamentFlexibleContentBlockPages::config()->getSitemapGeneratorService();
-
-                return $app->make($serviceClass);
-            }
+            GeneratesSitemap::class,
+            config('filament-flexible-content-block-pages.sitemap.generator_service', \Statikbe\FilamentFlexibleContentBlockPages\Services\SitemapGeneratorService::class)
         );
 
         // register slug changed listener

src/Services/Contracts/GeneratesSitemap.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Statikbe\FilamentFlexibleContentBlockPages\Services\Contracts;
+
+interface GeneratesSitemap
+{
+    /**
+     * Generate the sitemap and save it to the configured location.
+     */
+    public function generate(): void;
+}

src/Services/SitemapGeneratorService.php

@@ -7,19 +7,20 @@
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Spatie\Sitemap\Sitemap;
-use Spatie\Sitemap\SitemapGenerator;
+use Spatie\Sitemap\SitemapGenerator as SpatieSitemapGenerator;
 use Spatie\Sitemap\Tags\Alternate;
 use Spatie\Sitemap\Tags\Url;
 use Statikbe\FilamentFlexibleContentBlockPages\Facades\FilamentFlexibleContentBlockPages;
 use Statikbe\FilamentFlexibleContentBlockPages\Models\Page;
+use Statikbe\FilamentFlexibleContentBlockPages\Services\Contracts\GeneratesSitemap;
 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;
 use Statikbe\FilamentFlexibleContentBlocks\Models\Contracts\Linkable;
 
-class SitemapGeneratorService
+class SitemapGeneratorService implements GeneratesSitemap
 {
     protected Sitemap $sitemap;
 
@@ -75,7 +76,7 @@ protected function generateByCrawling(): void
     {
         $baseUrl = config('app.url');
 
-        $this->sitemap = SitemapGenerator::create($baseUrl)->getSitemap();
+        $this->sitemap = SpatieSitemapGenerator::create($baseUrl)->getSitemap();
     }
 
     protected function addPages(): void