Section parent: only allow objects #1938

getkirby · Sep 15, 2019 · 3e42806 · 3e42806
1 parent 3e63f93
commit 3e42806
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/config/sections/files.php b/config/sections/files.php
@@ -1,8 +1,6 @@
 <?php
 
 use Kirby\Cms\File;
-use Kirby\Toolkit\A;
-use Kirby\Toolkit\Str;
 
 return [
     'mixins' => [

diff --git a/config/sections/mixins/parent.php b/config/sections/mixins/parent.php
@@ -1,7 +1,5 @@
 <?php
 
-use Kirby\Toolkit\Str;
-
 return [
     'props' => [
         /**
@@ -22,6 +20,14 @@
                 if (!$parent) {
                     throw new Exception('The parent for the query "' . $query . '" cannot be found in the section "' . $this->name() . '"');
                 }
+
+                if (
+                    is_a($parent, 'Kirby\Cms\Page') === false &&
+                    is_a($parent, 'Kirby\Cms\Site') === false &&
+                    is_a($parent, 'Kirby\Cms\User') === false
+                ) {
+                    throw new Exception('The parent for the section "' . $this->name() . '" has to be a page, site or user object');
+                }
             }
 
             if ($parent === null) {

diff --git a/config/sections/pages.php b/config/sections/pages.php
@@ -2,7 +2,6 @@
 
 use Kirby\Cms\Blueprint;
 use Kirby\Toolkit\A;
-use Kirby\Toolkit\Str;
 
 return [
     'mixins' => [

diff --git a/tests/Cms/Sections/FilesSectionTest.php b/tests/Cms/Sections/FilesSectionTest.php
@@ -122,6 +122,31 @@ public function testParent()
         $this->assertEquals('pages/b/files', $section->upload()['api']);
     }
 
+    public function testParentCollectionFail()
+    {
+        $this->expectException('Exception');
+        $this->expectExceptionMessage('The parent for the section "files" has to be a page, site or user object');
+
+        $app = new App([
+            'site' => [
+                'children' => [
+                    [
+                        'slug' => 'a'
+                    ],
+                    [
+                        'slug' => 'b'
+                    ]
+                ]
+            ]
+        ]);
+
+        $section = new Section('files', [
+            'model'  => $app->page('a'),
+            'parent' => 'site.index'
+        ]);
+        $section->parentModel();
+    }
+
     public function testEmpty()
     {
         $section = new Section('files', [