Performance optimizations.

ivopetkov · ivopetkov · commit de1ff0bc5620 · 2017-06-14T13:54:56.000+03:00
diff --git a/src/HTMLServerComponentsCompiler.php b/src/HTMLServerComponentsCompiler.php
@@ -126,11 +126,7 @@ public function process($content, $options = [])
                 if ($componentElementsCount === 0) {
                     break;
                 }
-                for ($i = 0; $i < $componentElementsCount; $i++) {
-                    $componentElement = $componentElements->item($i);
-                    if ($componentElement === null) { // component in component innerHTML case
-                        continue;
-                    }
+                foreach ($componentElements as $componentElement) {
                     $component = $this->constructComponent($componentElement->getAttributes(), $componentElement->innerHTML);
                     $componentResultHTML = $getComponentResultHTML($component);
                     $isInBodyTag = false;
@@ -144,7 +140,8 @@ public function process($content, $options = [])
                     }
                     if ($isInBodyTag) {
                         $insertTargetName = 'html-server-components-compiler-insert-target';
-                        $componentElement->parentNode->replaceChild($domDocument->createInsertTarget($insertTargetName), $componentElement);
+                        $componentElement->parentNode->insertBefore($domDocument->createInsertTarget($insertTargetName), $componentElement);
+                        $componentElement->parentNode->removeChild($componentElement); // must be before insertHTML because a duplicate elements IDs can occur.
                         $domDocument->insertHTML($componentResultHTML, $insertTargetName);
                     } else {
                         $componentElement->parentNode->removeChild($componentElement);
diff --git a/tests/Test.php b/tests/Test.php
@@ -129,7 +129,6 @@ public function testProccessData()
     public function testComponentInComponentInnerHTML()
     {
 
-        $_GET['ivo'] = 1;
         $fullFilename1 = $this->createFile('component1.php', '<html><body>text1</body></html>');
         $fullFilename2 = $this->createFile('component2.php', '<html><head><title>hi</title><body><?= $component->innerHTML;?></body>/head></html>');
 

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,6 @@ public function testProccessData()`
`129`	`129`	`public function testComponentInComponentInnerHTML()`
`130`	`130`	`{`
`131`	`131`
`132`		`- $_GET['ivo'] = 1;`
`133`	`132`	`$fullFilename1 = $this->createFile('component1.php', '<html><body>text1</body></html>');`
`134`	`133`	`$fullFilename2 = $this->createFile('component2.php', '<html><head><title>hi</title><body><?= $component->innerHTML;?></body>/head></html>');`
`135`	`134`