Make the layout options avilable static, as they should not change pe…

…r model
plank · Nov 22, 2023 · 9ea93ac · 9ea93ac
1 parent c973f8e
commit 9ea93ac
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/Concerns/HasLayouts.php b/src/Concerns/HasLayouts.php
@@ -42,16 +42,16 @@ public static function indexLayout(): Layout
         return $layout;
     }
 
-    public function layouts(): Collection
+    public static function layouts(): Collection
     {
         $layoutModel = static::layoutModel();
 
         return $layoutModel::query()
             ->where($layoutModel::getLayoutableColumn(), static::layoutKey())
-            ->when($this->globalLayouts(), function (Builder $query) use ($layoutModel) {
+            ->when(static::globalLayouts(), function (Builder $query) use ($layoutModel) {
                 $query->orWhere(function (Builder $query) use ($layoutModel) {
                     $query->where($layoutModel::getTypeColumn(), LayoutType::Global)
-                        ->whereNotIn($layoutModel::getLayoutKeyColumn(), $this->excludedLayouts());
+                        ->whereNotIn($layoutModel::getLayoutKeyColumn(), static::excludedLayouts());
                 });
             })
             ->get()
@@ -146,10 +146,10 @@ protected static function layoutModel(): string
     /**
      * Determine if the Layoutable uses global layouts
      */
-    protected function globalLayouts(): bool
+    protected static function globalLayouts(): bool
     {
-        if (property_exists($this, 'globalLayouts')) {
-            return $this->globalLayouts;
+        if (property_exists(static::class, 'globalLayouts')) {
+            return static::$globalLayouts;
         }
 
         return true;
@@ -158,10 +158,10 @@ protected function globalLayouts(): bool
     /**
      * Exclude specific layouts by their keys
      */
-    protected function excludedLayouts(): array
+    protected static function excludedLayouts(): array
     {
-        if (property_exists($this, 'excludedLayouts')) {
-            return $this->excludedLayouts;
+        if (property_exists(static::class, 'excludedLayouts')) {
+            return static::$excludedLayouts;
         }
 
         return [];

diff --git a/src/Contracts/Layoutable.php b/src/Contracts/Layoutable.php
@@ -24,7 +24,7 @@ public static function indexLayout(): Layout;
      *
      * @return Collection<Layout>
      */
-    public function layouts(): Collection;
+    public static function layouts(): Collection;
 
     /**
      * Define the key which is used to identify the Index layout for the Layoutable

diff --git a/tests/Helper/Models/Page.php b/tests/Helper/Models/Page.php
@@ -17,7 +17,7 @@ class Page extends Model implements Contentable, Layoutable
 
     protected $guarded = ['id'];
 
-    protected array $excludedLayouts = [
+    protected static array $excludedLayouts = [
         'holidays',
     ];
 }
diff --git a/tests/Helper/Models/Post.php b/tests/Helper/Models/Post.php
@@ -17,5 +17,5 @@ class Post extends Model implements Contentable, Layoutable
 
     protected $guarded = ['id'];
 
-    protected bool $globalLayouts = false;
+    protected static bool $globalLayouts = false;
 }