Merge branch 'dev' into master

Author: paquettg

.gitignore

@@ -0,0 +1,4 @@
+composer.phar
+composer.lock
+/vendor/
+.idea/

.travis.yml

@@ -3,7 +3,7 @@ language: php
 php:
   - 5.6
   - 7.0
-  - hhvm
+  ~ 7.1
 
 install:
   - composer self-update

README.md

@@ -7,12 +7,12 @@ Version 1.7.0
 [![Coverage Status](https://coveralls.io/repos/paquettg/php-html-parser/badge.png)](https://coveralls.io/r/paquettg/php-html-parser)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/paquettg/php-html-parser/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/paquettg/php-html-parser/?branch=master)
 
-PHPHtmlParser is a simple, flexible, html parser which allows you to select tags using any css selector, like jQuery. The goal is to assiste in the development of tools which require a quick, easy way to scrap html, whether it's valid or not! This project was original supported by [sunra/php-simple-html-dom-parser](https://github.com/sunra/php-simple-html-dom-parser) but the support seems to have stopped so this project is my adaptation of his previous work.
+PHPHtmlParser is a simple, flexible, html parser which allows you to select tags using any css selector, like jQuery. The goal is to assist in the development of tools which require a quick, easy way to scrap html, whether it's valid or not! This project was original supported by [sunra/php-simple-html-dom-parser](https://github.com/sunra/php-simple-html-dom-parser) but the support seems to have stopped so this project is my adaptation of his previous work.
 
 Install
 -------
 
-This package can be found on [packagist](https://packagist.org/packages/paquettg/php-html-parser) and is best loaded using [composer](http://getcomposer.org/). We support php 5.6, 7.0, and hhvm 2.3.
+This package can be found on [packagist](https://packagist.org/packages/paquettg/php-html-parser) and is best loaded using [composer](http://getcomposer.org/). We support php 5.6, 7.0, 7.1.
 
 Usage
 -----
@@ -35,7 +35,7 @@ The above will output "click here". Simple no? There are many ways to get the sa
 Loading Files
 ------------------
 
-You may also seamlessly load a file into the dom instead of a string, which is much more convinient and is how I except most developers will be loading the html. The following example is taken from our test and uses the "big.html" file found there.
+You may also seamlessly load a file into the dom instead of a string, which is much more convenient and is how I except most developers will be loading the html. The following example is taken from our test and uses the "big.html" file found there.
 
 ```php
 // Assuming you installed from Composer:
@@ -61,9 +61,9 @@ foreach ($contents as $content)
 }
 ```
 
-This example loads the html from big.html, a real page found online, and gets all the content-border classes to process. It also shows a few things you can do with a node but it is not an exhaustive list of methods that a node has avaiable.
+This example loads the html from big.html, a real page found online, and gets all the content-border classes to process. It also shows a few things you can do with a node but it is not an exhaustive list of methods that a node has available.
 
-Alternativly, you can always use the `load()` method to load the file. It will attempt to find the file using `file_exists` and, if succesfull, will call `loadFromFile()` for you. The same applies to a URL and `loadFromUrl()` method.
+Alternativly, you can always use the `load()` method to load the file. It will attempt to find the file using `file_exists` and, if successful, will call `loadFromFile()` for you. The same applies to a URL and `loadFromUrl()` method.
 
 Loading Url
 ----------------
@@ -102,7 +102,7 @@ As long as the Connector object implements the `PHPHtmlParser\CurlInterface` int
 Loading Strings
 ---------------
 
-Loading a string directly, with out the checks in `load()` is also easely done.
+Loading a string directly, with out the checks in `load()` is also easily done.
 
 ```php
 // Assuming you installed from Composer:
@@ -142,19 +142,19 @@ At the moment we support 7 options.
 
 **Strict**
 
-Strict, by default false, will throw a `StrickException` if it find that the html is not strict complient (all tags must have a clossing tag, no attribute with out a value, etc.).
+Strict, by default false, will throw a `StrickException` if it find that the html is not strictly compliant (all tags must have a closing tag, no attribute with out a value, etc.).
 
 **whitespaceTextNode**
 
 The whitespaceTextNode, by default true, option tells the parser to save textnodes even if the content of the node is empty (only whitespace). Setting it to false will ignore all whitespace only text node found in the document.
 
 **enforceEncoding**
 
-The enforceEncoding, by default null, option will enforce an charater set to be used for reading the content and returning the content in that encoding. Setting it to null will trigger an attempt to figure out the encoding from within the content of the string given instead. 
+The enforceEncoding, by default null, option will enforce an character set to be used for reading the content and returning the content in that encoding. Setting it to null will trigger an attempt to figure out the encoding from within the content of the string given instead. 
 
 **cleanupInput**
 
-Set this to `true` to skip the entire clean up phase of the parser. If this is set to true the next 3 options will be ignored. Defaults to `false`.
+Set this to `false` to skip the entire clean up phase of the parser. If this is set to true the next 3 options will be ignored. Defaults to `true`.
 
 **removeScripts**
 
@@ -217,3 +217,13 @@ $a->delete();
 unset($a);
 echo $dom; // '<div class="all"><p>Hey bro, <br /> :)</p></div>');
 ```
+
+You can modify the text of `TextNode` objects easely. Please note that, if you set an encoding, the new text will be encoded using the existing encoding.
+
+```php
+$dom = new Dom;
+$dom->load('<div class="all"><p>Hey bro, <a href="google.com">click here</a><br /> :)</p></div>');
+$a   = $dom->find('a')[0];
+$a->firstChild()->setText('biz baz');
+echo $dom; // '<div class="all"><p>Hey bro, <a href="google.com">biz baz</a><br /> :)</p></div>'
+```

composer.json

@@ -15,10 +15,11 @@
     ],
     "require": {
         "php": ">=5.6",
+        "ext-mbstring": "*",
         "paquettg/string-encode": "~0.1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.3.0",
+        "phpunit/phpunit": "~5.7.0",
         "satooshi/php-coveralls": "~1.0.0",
         "mockery/mockery": "~0.9.0"
     },

src/PHPHtmlParser/Curl.php

@@ -28,6 +28,11 @@ public function get($url)
 
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($ch, CURLOPT_VERBOSE, true);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36');
+        curl_setopt($ch, CURLOPT_URL, $url);
 
         $content = curl_exec($ch);
         if ($content === false) {

src/PHPHtmlParser/Dom.php

@@ -79,17 +79,32 @@ class Dom
      * @var array
      */
     protected $selfClosing = [
-        'img',
+        'area',
+        'base',
+        'basefont',
         'br',
+        'col',
+        'embed',
+        'hr',
+        'img',
         'input',
-        'meta',
+        'keygen',
         'link',
-        'hr',
-        'base',
-        'embed',
+        'meta',
+        'param',
+        'source',
         'spacer',
+        'track',
+        'wbr'
     ];
 
+    /**
+     * A list of tags where there should be no /> at the end (html5 style)
+     *
+     * @var array
+     */
+    protected $noSlash = [];
+
     /**
      * Returns the inner html of the root node.
      *
@@ -120,6 +135,7 @@ public function __get($name)
      */
     public function load($str, $options = [])
     {
+        AbstractNode::resetCount();
         // check if it's a file
         if (strpos($str, "\n") === false && is_file($str)) {
             return $this->loadFromFile($str, $options);
@@ -219,6 +235,20 @@ public function find($selector, $nth = null)
         return $this->root->find($selector, $nth);
     }
 
+    /**
+     * Find element by Id on the root node
+     *
+     * @param int $id Element Id
+     * @return mixed
+     *
+     */
+    public function findById($id)
+    {
+        $this->isLoaded();
+
+        return $this->root->findById($id);
+    }
+
     /**
      * Adds the tag (or tags in an array) to the list of tags that will always
      * be self closing.
@@ -267,6 +297,53 @@ public function clearSelfClosingTags()
         return $this;
     }
 
+
+    /**
+     * Adds a tag to the list of self closing tags that should not have a trailing slash
+     *
+     * @param $tag
+     * @return $this
+     */
+    public function addNoSlashTag($tag)
+    {
+        if ( ! is_array($tag)) {
+            $tag = [$tag];
+        }
+        foreach ($tag as $value) {
+            $this->noSlash[] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Removes a tag from the list of no-slash tags.
+     *
+     * @param $tag
+     * @return $this
+     */
+    public function removeNoSlashTag($tag)
+    {
+        if ( ! is_array($tag)) {
+            $tag = [$tag];
+        }
+        $this->noSlash = array_diff($this->noSlash, $tag);
+
+        return $this;
+    }
+
+    /**
+     * Empties the list of no-slash tags.
+     *
+     * @return $this
+     */
+    public function clearNoSlashTags()
+    {
+        $this->noSlash = [];
+
+        return $this;
+    }
+
     /**
      * Simple wrapper function that returns the first child.
      *
@@ -291,6 +368,42 @@ public function lastChild()
         return $this->root->lastChild();
     }
 
+    /**
+     * Simple wrapper function that returns count of child elements
+     *
+     * @return int
+     */
+    public function countChildren()
+    {
+        $this->isLoaded();
+
+        return $this->root->countChildren();
+    }
+
+    /**
+     * Get array of children
+     *
+     * @return array
+     */
+    public function getChildren()
+    {
+        $this->isLoaded();
+
+        return $this->root->getChildren();
+    }
+
+    /**
+     * Check if node have children nodes
+     *
+     * @return bool
+     */
+    public function hasChildren()
+    {
+        $this->isLoaded();
+
+        return $this->root->hasChildren();
+    }
+
     /**
      * Simple wrapper function that returns an element by the
      * id.
@@ -391,7 +504,9 @@ protected function clean($str)
         }
 
         // strip out server side scripts
-        $str = mb_eregi_replace("(<\?)(.*?)(\?>)", '', $str);
+        if ($this->options->get('serverSideScriptis') == true){
+            $str = mb_eregi_replace("(<\?)(.*?)(\?>)", '', $str);
+        }
 
         // strip smarty scripts
         $str = mb_eregi_replace("(\{\w)(.*?)(\})", '', $str);
@@ -516,8 +631,8 @@ protected function parseTag()
             }
 
             if (empty($name)) {
-                $this->content->fastForward(1);
-                continue;
+				$this->content->skipByToken('blank');
+				continue;
             }
 
             $this->content->skipByToken('blank');
@@ -588,6 +703,13 @@ protected function parseTag()
 
             // We force self closing on this tag.
             $node->getTag()->selfClosing();
+
+            // Should this tag use a trailing slash?
+            if(in_array($tag, $this->noSlash))
+            {
+                $node->getTag()->noTrailingSlash();
+            }
+
         }
 
         $this->content->fastForward(1);