No longer misinterpret builder blocks as layouts #2966

getkirby · Dec 10, 2020 · 05404af · afbora · Dec 10, 2020 · bastianallgeier
1 parent 660085d
commit 05404af
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/Cms/Blocks.php b/src/Cms/Blocks.php
@@ -76,6 +76,15 @@ protected static function extractFromLayouts(array $input): array
             return [];
         }
 
+        if (
+            // no columns = no layout
+            array_key_exists('columns', $input[0]) === false ||
+            // checks if this is a block for the builder plugin
+            array_key_exists('_key', $input[0]) === true
+        ) {
+            return $input;
+        }
+
         // no layouts
         if (array_key_exists('columns', $input[0]) === false) {
             return $input;

diff --git a/tests/Cms/Blocks/BlocksTest.php b/tests/Cms/Blocks/BlocksTest.php
@@ -54,6 +54,26 @@ public function testFactoryFromLayouts()
         $this->assertSame('text', $blocks->last()->type());
     }
 
+    public function testFactoryFromBuilderWithColumns()
+    {
+        $builder = [
+            [
+                '_key' => 'heading',
+                'columns' => 1,
+            ],
+            [
+                '_key' => 'text',
+                'columns' => 2,
+            ]
+        ];
+
+        $blocks = Blocks::factory($builder);
+
+        $this->assertCount(2, $blocks);
+        $this->assertSame('heading', $blocks->first()->type());
+        $this->assertSame('text', $blocks->last()->type());
+    }
+
     public function testParseJson()
     {
         $input = [