Merge pull request #39 from godismyjudge95/patch-1

Fix multidimensional array check
ueberdosis · Aug 12, 2024 · d617b6c · d617b6c
2 parents e4e2cfe + 441711c
commit d617b6c
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/src/Core/DOMParser.php b/src/Core/DOMParser.php
@@ -122,6 +122,17 @@ private function processChildren($node): array
         return $this->mergeSimilarNodes($nodes);
     }
 
+    private function isMultidimensionalArray($array)
+    {
+        foreach ($array as $value) {
+            if (is_array($value)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private function mergeSimilarNodes($nodes)
     {
         $result = [];
@@ -131,10 +142,7 @@ private function mergeSimilarNodes($nodes)
          */
         array_reduce($nodes, function ($carry, $node) use (&$result) {
             // Ignore multidimensional arrays
-            if (
-                count($node) !== count($node, COUNT_RECURSIVE)
-                || count($carry) !== count($carry, COUNT_RECURSIVE)
-            ) {
+            if ($this->isMultidimensionalArray($node) || $this->isMultidimensionalArray($carry)) {
                 $result[] = $node;
 
                 return $node;

diff --git a/tests/DOMParser/EmptyNodesTest.php b/tests/DOMParser/EmptyNodesTest.php
@@ -0,0 +1,25 @@
+<?php
+
+use Tiptap\Editor;
+
+test('parsing must not fail on empty nodes', function () {
+    $html = '<p><img /></p><p><img /></p>';
+
+    $result = (new Editor)
+        ->setContent($html)
+        ->getDocument();
+
+    expect($result)->toEqual([
+        'type' => 'doc',
+        'content' => [
+            [
+                'type' => 'paragraph',
+                'content' => [],
+            ],
+            [
+                'type' => 'paragraph',
+                'content' => [],
+            ],
+        ],
+    ]);
+});