Merge pull request #115 from musimana/11.x

v11.8.3
musimana · Jul 6, 2024 · cfc68aa · cfc68aa
2 parents 639b4d9 + 3b45329
commit cfc68aa
Show file tree

Hide file tree

Showing 31 changed files with 348 additions and 281 deletions.
diff --git a/app/Http/Controllers/Public/PageController.php b/app/Http/Controllers/Public/PageController.php
@@ -36,7 +36,7 @@ public function show(Page $page): RedirectResponse|Response
         return (new PublicViewRepository)
             ->getViewDetails(
                 $template->value,
-                (new PageContentResource)->getItem($page),
+                (new PageContentResource($page))->getItem(),
                 (new PageMetadataResource)->getItem($page)
             );
     }

diff --git a/app/Http/Controllers/Public/PrivacyPolicyController.php b/app/Http/Controllers/Public/PrivacyPolicyController.php
@@ -20,7 +20,7 @@ public function __invoke(): Response
 
         return (new PublicViewRepository)->getViewDetails(
             $template,
-            (new PageContentResource)->getItem($page),
+            (new PageContentResource($page))->getItem(),
             (new PageMetadataResource)->getItem($page)
         );
     }

diff --git a/app/Http/Resources/Views/Auth/Summaries/CreateEditSummaryResource.php b/app/Http/Resources/Views/Auth/Summaries/CreateEditSummaryResource.php
@@ -10,14 +10,14 @@ final class CreateEditSummaryResource implements PageItemInterface
     /**
      * Get the resource as an array.
      *
-     * @return array{content: string, title: string, url: string}
+     * @return array{content: string, title: string, url: string|false}
      */
     public function getItem(Page $page): array
     {
         return [
             'content' => $page->getMetaDescription(),
             'title' => $page->getTitle(),
-            'url' => $page->getUrlEdit(),
+            'url' => $page->getUrlAdminEdit(),
         ];
     }
 }
diff --git a/app/Http/Resources/Views/Public/Content/PageContentResource.php b/app/Http/Resources/Views/Public/Content/PageContentResource.php
@@ -3,13 +3,18 @@
 namespace App\Http\Resources\Views\Public\Content;
 
 use App\Http\Resources\Views\Public\Blocks\BlocksResource;
-use App\Interfaces\Resources\Items\PageItemInterface;
+use App\Interfaces\Resources\Items\ConstantItemInterface;
 use App\Models\Page;
 
-final class PageContentResource implements PageItemInterface
+final class PageContentResource implements ConstantItemInterface
 {
+    /** Instantiate the resource. */
+    public function __construct(
+        protected Page $page = new Page
+    ) {}
+
     /**
-     * Get the content array for the given page's full public resource.
+     * Get the full public item array for the resource's page.
      *
      * @return array{
      *  blocks: array<int, array{
@@ -21,13 +26,13 @@ final class PageContentResource implements PageItemInterface
      *  subheading: string,
      * }
      */
-    public function getItem(Page $page): array
+    public function getItem(): array
     {
         return [
-            'blocks' => (new BlocksResource)->getItems($page->blocks),
-            'bodytext' => $page->getContent(),
-            'heading' => $page->getTitle(),
-            'subheading' => $page->getSubtitle(),
+            'blocks' => (new BlocksResource)->getItems($this->page->blocks),
+            'bodytext' => $this->page->getContent(),
+            'heading' => $this->page->getTitle(),
+            'subheading' => $this->page->getSubtitle(),
         ];
     }
 }
diff --git a/app/Http/Resources/Views/Sitemaps/PageSitemapResource.php b/app/Http/Resources/Views/Sitemaps/PageSitemapResource.php
@@ -2,31 +2,40 @@
 
 namespace App\Http\Resources\Views\Sitemaps;
 
-use App\Interfaces\Resources\Items\PageItemInterface;
+use App\Interfaces\Resources\Items\ConstantItemInterface;
 use App\Models\Page;
 
-final class PageSitemapResource implements PageItemInterface
+final class PageSitemapResource implements ConstantItemInterface
 {
+    /** Instantiate the resource. */
+    public function __construct(
+        protected Page $page = new Page,
+        protected string $changefreq = 'monthly',
+        protected string $priority = '0.7'
+    ) {}
+
     /**
      * Get the content array for the given page's sitemap item.
      *
      * @return array{
      *  loc: string,
      *  lastmod: string,
      *  changefreq: string,
-     *  priority: float
+     *  priority: string
      * }
      */
-    public function getItem(Page $page): array
+    public function getItem(): array
     {
-        $updated_at = strtotime(strval($page->updated_at));
-        $lastmod = $updated_at ? date('Y-m-d', $updated_at) : strval(config('metadata.first_published_year')) . '-01-01';
+        $updated_at = strtotime(strval($this->page->updated_at));
+        $lastmod = $updated_at
+            ? date('Y-m-d', $updated_at)
+            : strval(config('metadata.first_published_year')) . '-01-01';
 
         return [
-            'loc' => $page->getUrl(),
+            'loc' => $this->page->getUrl(),
             'lastmod' => $lastmod,
-            'changefreq' => 'weekly',
-            'priority' => 0.8,
+            'changefreq' => $this->changefreq,
+            'priority' => $this->priority,
         ];
     }
 }
diff --git a/app/Http/Resources/Views/Sitemaps/PagesSitemapResource.php b/app/Http/Resources/Views/Sitemaps/PagesSitemapResource.php
@@ -14,7 +14,7 @@ final class PagesSitemapResource implements ConstantIndexInterface
      *  loc: string,
      *  lastmod: string,
      *  changefreq: string,
-     *  priority: float
+     *  priority: string
      * }>
      */
     public function getItems(): array
@@ -23,20 +23,20 @@ public function getItems(): array
 
         if (!Page::where([['is_homepage', true], ['in_sitemap', true]])->exists()) {
             $page = Page::factory()->homePage()->make(['updated_at' => Page::min('updated_at')]);
-            $static_pages[] = (new PageSitemapResource)->getItem($page);
+            $static_pages[] = (new PageSitemapResource($page, 'weekly', '1.0'))->getItem();
         }
 
         if (!Page::where([['slug', 'privacy'], ['in_sitemap', true]])->exists()) {
             $page = Page::factory()->privacyPage()->make(['updated_at' => Page::min('updated_at')]);
-            $static_pages[] = (new PageSitemapResource)->getItem($page);
+            $static_pages[] = (new PageSitemapResource($page, 'yearly', '0.1'))->getItem();
         }
 
         return array_merge(
             $static_pages,
             Page::query()
                 ->inSitemap()
                 ->get()
-                ->map(fn ($page) => (new PageSitemapResource)->getItem($page))
+                ->map(fn ($page) => (new PageSitemapResource($page))->getItem())
                 ->toArray(),
         );
     }

diff --git a/app/Models/Page.php b/app/Models/Page.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Traits\Admin\IsAdminResource;
 use App\Traits\HasPageView;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -10,7 +11,6 @@
 use Illuminate\Database\Query\Builder as QueryBuilder;
 
 /**
- * @method Builder|static inSitemap()
  * @method Builder|static isHomepage()
  * @method Builder|static isNotHomepage()
  * @method static Builder|static query()
@@ -19,6 +19,7 @@ final class Page extends Model
 {
     use HasFactory,
         HasPageView,
+        IsAdminResource,
         SoftDeletes;
 
     /**
@@ -68,20 +69,6 @@ public function getUrl(): string
             : route('page.show', $this->slug);
     }
 
-    /** Get the admin URL for the page edit view. */
-    public function getUrlEdit(): string
-    {
-        return route('admin.page.edit', $this->slug);
-    }
-
-    /** Returns all Page models that should be in the sitemap (in_sitemap = 1). */
-    public function scopeInSitemap(Builder|QueryBuilder $query): Builder|QueryBuilder
-    {
-        return $query->where(function ($query) {
-            $query->where('in_sitemap', 1);
-        });
-    }
-
     /** Return all Page models flagged as the homepage (is_homepage = 1). */
     public function scopeIsHomepage(Builder|QueryBuilder $query): Builder|QueryBuilder
     {

diff --git a/app/Repositories/Views/SitemapViewRepository.php b/app/Repositories/Views/SitemapViewRepository.php
@@ -13,7 +13,7 @@ final class SitemapViewRepository
      *  loc: string,
      *  lastmod: string,
      *  changefreq: string,
-     *  priority: float
+     *  priority: string
      * }|string>  $items  = []
      */
     public function getView(string $template, array $items = []): View

diff --git a/app/Services/ReflectionService.php b/app/Services/ReflectionService.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Services;
+
+use ReflectionClass;
+
+final class ReflectionService
+{
+    /**
+     * Get the class name for the given class.
+     *
+     * @param  class-string  $class
+     */
+    public static function getClassName(string $class): ?string
+    {
+        return (new ReflectionClass($class))->getShortName();
+    }
+}
diff --git a/app/Traits/Admin/HasAdminEdit.php b/app/Traits/Admin/HasAdminEdit.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Traits\Admin;
+
+use App\Services\ReflectionService;
+
+trait HasAdminEdit
+{
+    /** Get the admin URL for the resource's edit view. */
+    public function getUrlAdminEdit(): string|false
+    {
+        $class_name = ReflectionService::getClassName(self::class);
+
+        return $class_name
+            ? route('admin.' . strtolower($class_name) . '.edit', $this->id)
+            : false;
+    }
+}
diff --git a/app/Traits/Admin/IsAdminResource.php b/app/Traits/Admin/IsAdminResource.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Traits\Admin;
+
+trait IsAdminResource
+{
+    use HasAdminEdit;
+}
diff --git a/app/Traits/HasPageView.php b/app/Traits/HasPageView.php
@@ -2,6 +2,13 @@
 
 namespace App\Traits;
 
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+
+/**
+ * @method Builder|static inSitemap()
+ * @method static Builder|static query()
+ */
 trait HasPageView
 {
     use HasContentBlocks;
@@ -35,4 +42,12 @@ public function isInSitemap(): bool
     {
         return $this->in_sitemap ?? false;
     }
+
+    /** Returns all models that should be in the sitemap (in_sitemap = 1). */
+    public function scopeInSitemap(Builder|QueryBuilder $query): Builder|QueryBuilder
+    {
+        return $query->where(function ($query) {
+            $query->where('in_sitemap', 1);
+        });
+    }
 }
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         "php": "8.2.*||8.3.*",
         "guzzlehttp/guzzle": "^7.8.1",
         "inertiajs/inertia-laravel": "^1.3",
-        "laravel/framework": "^11.11",
+        "laravel/framework": "^11.14",
         "laravel/tinker": "^2.9.0",
         "tightenco/ziggy": "^1.8.2"
     },
@@ -25,7 +25,7 @@
         "larastan/larastan": "^2.9",
         "laravel/dusk": "^8.2",
         "laravel/pint": "^1.16",
-        "laravel/sail": "^1.29",
+        "laravel/sail": "^1.30",
         "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^8.1.1",
         "pestphp/pest": "^2.34",