Merge pull request paquettg#101 from mallardduck/patch-1

Fix issues with HTML cache and updates

Author: paquettg

src/PHPHtmlParser/Dom/AbstractNode.php

@@ -169,8 +169,8 @@ public function delete()
         if ( ! is_null($this->parent)) {
             $this->parent->removeChild($this->id);
         }
-
-        $this->parent = null;
+        $this->parent->clear();
+        $this->clear();
     }
 
     /**
@@ -305,6 +305,9 @@ public function setAttribute($key, $value)
     {
         $this->tag->setAttribute($key, $value);
 
+        //clear any cache
+        $this->clear();
+
         return $this;
     }
 
@@ -318,6 +321,9 @@ public function setAttribute($key, $value)
     public function removeAttribute($key)
     {
         $this->tag->removeAttribute($key);
+
+        //clear any cache
+        $this->clear();
     }
 
     /**
@@ -329,8 +335,10 @@ public function removeAttribute($key)
     public function removeAllAttributes()
     {
         $this->tag->removeAllAttributes();
-    }
 
+        //clear any cache
+        $this->clear();
+    }
     /**
      * Function to locate a specific ancestor tag in the path to the root.
      *

src/PHPHtmlParser/Dom/HtmlNode.php

@@ -186,6 +186,9 @@ protected function clear()
         $this->innerHtml = null;
         $this->outerHtml = null;
         $this->text      = null;
+        if (is_null($this->parent) === false) {
+            $this->parent->clear();
+        }
     }
 
     /**

src/PHPHtmlParser/Dom/InnerNode.php

@@ -242,6 +242,9 @@ public function replaceChild($childId, AbstractNode $newChild)
         $this->children                  = array_combine($keys, $this->children);
         $this->children[$newChild->id()] = $newChild;
         unset($oldChild);
+        
+        //clear any cache
+        $this->clear();
     }
 
     /**
@@ -314,4 +317,4 @@ public function setParent(InnerNode $parent)
 
         return parent::setParent($parent);
     }
-}
+}

src/PHPHtmlParser/Dom/MockNode.php

@@ -40,6 +40,9 @@ protected function clear()
         $this->innerHtml = null;
         $this->outerHtml = null;
         $this->text      = null;
+        if (is_null($this->parent) === false) {
+            $this->parent->clear();
+        }
     }
 
     /**

tests/Node/HtmlTest.php

@@ -246,6 +246,39 @@ public function testOuterHtmlNoValueAttribute()
         $this->assertEquals('<div class="all"><a href=\'http://google.com\' ui-view>link</a><br /></div>', $parent->outerHtml);
     }
 
+    public function testOuterHtmlWithChanges()
+    {
+        $div = new Tag('div');
+        $div->setAttributes([
+            'class' => [
+                'value'       => 'all',
+                'doubleQuote' => true,
+            ],
+        ]);
+        $a = new Tag('a');
+        $a->setAttributes([
+            'href' => [
+                'value'       => 'http://google.com',
+                'doubleQuote' => false,
+            ],
+        ]);
+        $br = new Tag('br');
+        $br->selfClosing();
+
+        $parent  = new HtmlNode($div);
+        $childa  = new HtmlNode($a);
+        $childbr = new HtmlNode($br);
+        $parent->addChild($childa);
+        $parent->addChild($childbr);
+        $childa->addChild(new TextNode('link'));
+
+        $this->assertEquals('<div class="all"><a href=\'http://google.com\'>link</a><br /></div>', $parent->outerHtml());
+        
+        $childa->setAttribute('href', 'https://www.google.com');
+        
+        $this->assertEquals('<a href="https://www.google.com">link</a>', $childa->outerHtml());
+    }
+
     public function testText()
     {
         $a    = new Tag('a');

tests/Node/TagTest.php

@@ -68,6 +68,30 @@ public function testSetAttributesNoDoubleArray()
         $this->assertEquals('funtimes', $tag->class['value']);
     }
 
+    public function testUpdateAttributes()
+    {
+        $tag = new Tag('a');
+        $tag->setAttributes([
+            'href' => [
+                'value'       => 'http://google.com',
+                'doubleQuote' => false,
+            ],
+        ]);
+
+        $this->assertEquals(null, $tag->class['value']);
+        $this->assertEquals('http://google.com', $tag->href['value']);
+
+
+        $attr = [
+            'href'  => 'https://www.google.com',
+            'class' => 'funtimes',
+        ];
+
+        $tag->setAttributes($attr);
+        $this->assertEquals('funtimes', $tag->class['value']);
+        $this->assertEquals('https://www.google.com', $tag->href['value']);
+    }
+
     public function testNoise()
     {
         $tag = new Tag('a');