fixed bugs & patch Memory Leak

rez1dent3 · rez1dent3 · commit 1a416e5a8b6f · 2018-05-18T21:11:38.000+03:00
diff --git a/demo/issue/10.php b/demo/issue/10.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * @see https://github.com/monkeysuffrage/advanced_html_dom/issues/10
+ */
+
+include_once dirname(__DIR__, 2) . '/vendor/autoload.php';
+
+$dom = \Bavix\AdvancedHtmlDom\strGetHtml('<html><table><tr><td>1
+<td>2<tr><td>3<td></body></html>');
+
+var_dump($dom->find('tr',0)->clean_text);
diff --git a/demo/issue/9.php b/demo/issue/9.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @see https://github.com/monkeysuffrage/advanced_html_dom/issues/9
+ */
+
+include_once dirname(__DIR__, 2) . '/vendor/autoload.php';
+
+$dom = \Bavix\AdvancedHtmlDom\strGetHtml('<body><p>x</p><p>y</p></body>');
+
+echo $dom->find('p')[1];
diff --git a/src/AdvancedHtmlDom/AHTMLNode.php b/src/AdvancedHtmlDom/AHTMLNode.php
@@ -2,6 +2,13 @@
 
 namespace Bavix\AdvancedHtmlDom;
 
+/**
+ * Class AHTMLNode
+ *
+ * @package Bavix\AdvancedHtmlDom
+ *
+ * @property-read string $clean_text
+ */
 class AHTMLNode extends AdvancedHtmlBase implements \ArrayAccess
 {
 
@@ -24,6 +31,16 @@ public function __construct($node, $doc)
         $this->is_text = $node->nodeName === '#text';
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function __destruct()
+    {
+        $this->_path = null;
+        unset($this->_path);
+        parent::__destruct();
+    }
+
     /**
      * @param $html
      *
@@ -209,10 +226,14 @@ public function offsetGet($offset)
      */
     public function offsetSet($key, $value)
     {
+        if (\in_array($key, ['_path','dom','doc','node']))
+        {
+            return;
+        }
+
         if ($value)
         {
             $this->node->setAttribute($key, $value);
-
             return;
         }
 
diff --git a/src/AdvancedHtmlDom/AHTMLNodeList.php b/src/AdvancedHtmlDom/AHTMLNodeList.php
@@ -32,6 +32,16 @@ public function __construct($nodeList, $doc)
         $this->doc      = $doc;
     }
 
+    /**
+     * @see https://github.com/monkeysuffrage/advanced_html_dom/issues/19
+     */
+    public function __destruct()
+    {
+        $this->nodeList = $this->doc = null;
+        unset($this->nodeList, $this->doc);
+        Cleanup::all();
+    }
+
     /*
     abstract public boolean offsetExists ( mixed $offset )
     abstract public mixed offsetGet ( mixed $offset )
diff --git a/src/AdvancedHtmlDom/AdvancedHtmlBase.php b/src/AdvancedHtmlDom/AdvancedHtmlBase.php
@@ -25,6 +25,16 @@ class AdvancedHtmlBase
      */
     public $is_text = false;
 
+    /**
+     * @see https://github.com/monkeysuffrage/advanced_html_dom/issues/19
+     */
+    public function __destruct()
+    {
+        $this->doc = $this->dom = $this->node = null;
+        unset($this->doc, $this->dom, $this->node);
+        Cleanup::all();
+    }
+
     /**
      * @return mixed
      */
@@ -203,7 +213,7 @@ public function __call($key, $args)
 
             // attributes
             case 'hasattribute':
-                return !$this->is_text && $this->node->getAttribute($args[0]);
+                return !$this->is_text && $this->node->hasAttribute($args[0]);
 
             case 'getattribute':
                 $arg = $args[0];
@@ -268,6 +278,10 @@ public function __call($key, $args)
             return $this->$arg1($this->$arg2);
         }
 
+        if (\in_array($key, ['dom','node','doc'])) {
+            return null;
+        }
+
         if (!\preg_match(ATTRIBUTE_REGEX, $key, $m))
         {
             \trigger_error('Unknown method or property: ' . $key, E_USER_WARNING);
diff --git a/src/AdvancedHtmlDom/AdvancedHtmlDom.php b/src/AdvancedHtmlDom/AdvancedHtmlDom.php
@@ -37,6 +37,16 @@ public function __construct($html = null, $is_xml = false)
         }
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function __destruct()
+    {
+        $this->xpath = $this->root = null;
+        unset($this->xpath, $this->root);
+        parent::__destruct();
+    }
+
     /**
      * @param InterfaceCache $cache
      */
diff --git a/src/AdvancedHtmlDom/CacheSystem/CacheStatic.php b/src/AdvancedHtmlDom/CacheSystem/CacheStatic.php
@@ -5,8 +5,16 @@
 class CacheStatic implements InterfaceCache
 {
 
+    /**
+     * @var array
+     */
     protected static $cache = [];
 
+    /**
+     * @param $url
+     *
+     * @return mixed
+     */
     public function get($url)
     {
         if (!isset(self::$cache[$url]))
diff --git a/src/AdvancedHtmlDom/Cleanup.php b/src/AdvancedHtmlDom/Cleanup.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Bavix\AdvancedHtmlDom;
+
+class Cleanup {
+    public static function all(): void {
+        if (\function_exists('gc_collect_cycles')) {
+            \gc_collect_cycles();
+        }
+
+        if (\function_exists('gc_mem_caches')) {
+            \gc_mem_caches();
+        }
+    }
+}
+
