* Update to PHPHtmlParser 1.7.0

* Version Bump to 1.3.6.2
thampe · Aug 30, 2016 · 257396b · 257396b
1 parent cc9cd32
commit 257396b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 51 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "hampe/inky",
     "description": "PHP Implementation of ZURB's Foundation for Email parser (Inky)",
-    "version":     "1.3.6.1",
+    "version":     "1.3.6.2",
     "license": "MIT",
     "authors": [
         {
@@ -19,6 +19,6 @@
     },
     "require": {
         "php": ">=5.4.0",
-        "paquettg/php-html-parser": "^1.6"
+        "paquettg/php-html-parser": "^1.7"
     }
 }
diff --git a/src/Inky.php b/src/Inky.php
@@ -29,10 +29,11 @@
 use Hampe\Inky\Component\RowFactory;
 use Hampe\Inky\Component\SpacerFactory;
 use Hampe\Inky\Component\WrapperFactory;
-use Hampe\Inky\PHPHtmlParser\Dom;
+use PHPHtmlParser\Dom;
 use PHPHtmlParser\Dom\AbstractNode;
 use PHPHtmlParser\Dom\Collection;
 use PHPHtmlParser\Dom\HtmlNode;
+use PHPHtmlParser\Dom\InnerNode;
 use PHPHtmlParser\Exceptions\CircularException;
 
 class Inky
@@ -183,6 +184,10 @@ protected function getAllComponentFactories()
     public function releaseTheKraken($html)
     {
         $dom = new Dom();
+        $dom->setOptions([
+            'removeStyles' => false,
+            'removeScripts' => false,
+        ]);
         $dom->load((string) $html);
 
         $parseCounter = 0;
@@ -196,14 +201,15 @@ public function releaseTheKraken($html)
         return $dom->root->outerhtml;
     }
 
-    protected function clearCache(AbstractNode $node)
+    protected function clearCache(InnerNode $node)
     {
         foreach($node->getChildren() as $child) {
             if($child instanceof AbstractNode) {
-                $this->clearCache($child);
+                if($child instanceof InnerNode) {
+                    $this->clearCache($child);
+                }
                 $node->removeChild($child->id());
                 $node->addChild($child);
-
             }
         }
     }
@@ -237,7 +243,11 @@ protected function parse(Dom $dom)
                     $parseInComplete = true;
                     //replace element with new element
                     $parent = $element->getParent();
-                    $siblings = $element->getParent()->getChildren();
+                    if(!$parent instanceof InnerNode) {
+                        continue;
+                    }
+
+                    $siblings = $parent->getChildren();
                     foreach($siblings as $sibling) {
                         /** @var $sibling HtmlNode*/
                         $parent->removeChild($sibling->id());

diff --git a/src/PHPHtmlParser/Dom.php b/src/PHPHtmlParser/Dom.php
diff --git a/tests/Component/AbstractComponentFactoryTest.php b/tests/Component/AbstractComponentFactoryTest.php
@@ -16,7 +16,7 @@
 
 
 use Hampe\Inky\Inky;
-use Hampe\Inky\PHPHtmlParser\Dom;
+use PHPHtmlParser\Dom;
 
 class AbstractComponentFactoryTest extends \PHPUnit_Framework_TestCase {
 
@@ -43,6 +43,10 @@ public function testParse()
         foreach($this->testCases as $caseName => $testCase) {
             $fromHtml = trim(preg_replace('~>\s+<~', '><', $testCase['from']));
             $dom = new Dom();
+            $dom->setOptions([
+                'removeStyles' => false,
+                'removeScripts' => false,
+            ]);
             $dom->load((string)  trim(preg_replace('~>\s+<~', '><', $testCase['to'])));
             $toHtml = $dom->root->outerHtml();
             $result = $inky->releaseTheKraken($fromHtml);

diff --git a/tests/InkyTest.php b/tests/InkyTest.php
@@ -11,7 +11,7 @@
  *  @date       13.03.16
  */
 
-use Hampe\Inky\PHPHtmlParser\Dom;
+use PHPHtmlParser\Dom;
 
 
 class InkyTest extends PHPUnit_Framework_TestCase {
@@ -56,6 +56,10 @@ public function testStyles()
         foreach($stylesTestCases as $caseName => $testCase) {
             $fromHtml = trim(preg_replace('~>\s+<~', '><', $testCase['from']));
             $dom = new Dom();
+            $dom->setOptions([
+                'removeStyles' => false,
+                'removeScripts' => false,
+            ]);
             $dom->load((string)  trim(preg_replace('~>\s+<~', '><', $testCase['to'])));
             $toHtml = $dom->root->outerHtml();
             $result = $inky->releaseTheKraken($fromHtml);