From a7bebe7ff7a290ba09c242b32a682d1fcb459329 Mon Sep 17 00:00:00 2001
From: Andreas Braun <git@alcaeus.org>
Date: Wed, 10 Jan 2018 08:42:42 +0100
Subject: [PATCH 1/7] Update supported PHP versions

---
 .travis.yml   |  9 ++++++---
 composer.json | 13 ++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3d25dc56..7280c699 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,17 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - hhvm
+  - 7.1
+  - 7.2
+  - nightly
 
 install:
   - composer self-update
   - composer install --dev --no-interaction
 
+allowed_failures:
+  - nightly
+
 script:
   - vendor/bin/phpunit
 
diff --git a/composer.json b/composer.json
index 1f300ed8..4b8494cf 100644
--- a/composer.json
+++ b/composer.json
@@ -18,13 +18,13 @@
         }
     ],
     "require": {
-        "php": "^5.6 || ^7.0",
-        "paquettg/string-encode": "~0.1.0"
+        "php": "^7.1",
+        "paquettg/string-encode": "^0.1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.3.0",
-        "satooshi/php-coveralls": "~1.0.0",
-        "mockery/mockery": "~0.9.0"
+        "phpunit/phpunit": "^6.5",
+        "php-coveralls/php-coveralls": "^2.0",
+        "mockery/mockery": "^1.0"
     },
     "replace": {
         "paquettg/php-html-parser": "self.version"
@@ -33,6 +33,5 @@
         "psr-0": {
             "PHPHtmlParser": "src/"
         }
-    },
-    "prefer-stable": true
+    }
 }

From 50412a6f7a878c9497c46d8b5f7a18c8a9b74b5f Mon Sep 17 00:00:00 2001
From: Andreas Braun <git@alcaeus.org>
Date: Wed, 10 Jan 2018 10:52:40 +0100
Subject: [PATCH 2/7] Don't use multibyte regex functions

---
 src/PHPHtmlParser/Dom.php          | 22 +++++++++++-----------
 src/PHPHtmlParser/Dom/TextNode.php |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/PHPHtmlParser/Dom.php b/src/PHPHtmlParser/Dom.php
index f3e17ff9..cc637a42 100644
--- a/src/PHPHtmlParser/Dom.php
+++ b/src/PHPHtmlParser/Dom.php
@@ -359,8 +359,8 @@ protected function clean($str)
         }
 
         // remove white space before closing tags
-        $str = mb_eregi_replace("'\s+>", "'>", $str);
-        $str = mb_eregi_replace('"\s+>', '">', $str);
+        $str = preg_replace("#'\s+>#i", "'>", $str);
+        $str = preg_replace('#"\s+>#i', '">', $str);
 
         // clean out the \n\r
         $replace = ' ';
@@ -370,31 +370,31 @@ protected function clean($str)
         $str = str_replace(["\r\n", "\r", "\n"], $replace, $str);
 
         // strip the doctype
-        $str = mb_eregi_replace("<!doctype(.*?)>", '', $str);
+        $str = preg_replace("#<!doctype(.*?)>#i", '', $str);
 
         // strip out comments
-        $str = mb_eregi_replace("<!--(.*?)-->", '', $str);
+        $str = preg_replace("#<!--(.*?)-->#i", '', $str);
 
         // strip out cdata
-        $str = mb_eregi_replace("<!\[CDATA\[(.*?)\]\]>", '', $str);
+        $str = preg_replace("#<!\[CDATA\[(.*?)\]\]>#i", '', $str);
 
         // strip out <script> tags
         if ($this->options->get('removeScripts') == true) {
-            $str = mb_eregi_replace("<\s*script[^>]*[^/]>(.*?)<\s*/\s*script\s*>", '', $str);
-            $str = mb_eregi_replace("<\s*script\s*>(.*?)<\s*/\s*script\s*>", '', $str);
+            $str = preg_replace("#<\s*script[^>]*[^/]>(.*?)<\s*/\s*script\s*>#i", '', $str);
+            $str = preg_replace("#<\s*script\s*>(.*?)<\s*/\s*script\s*>#i", '', $str);
         }
 
         // strip out <style> tags
         if ($this->options->get('removeStyles') == true) {
-            $str = mb_eregi_replace("<\s*style[^>]*[^/]>(.*?)<\s*/\s*style\s*>", '', $str);
-            $str = mb_eregi_replace("<\s*style\s*>(.*?)<\s*/\s*style\s*>", '', $str);
+            $str = preg_replace("#<\s*style[^>]*[^/]>(.*?)<\s*/\s*style\s*>#", '', $str);
+            $str = preg_replace("#<\s*style\s*>(.*?)<\s*/\s*style\s*>#", '', $str);
         }
 
         // strip out server side scripts
-        $str = mb_eregi_replace("(<\?)(.*?)(\?>)", '', $str);
+        $str = preg_replace("#(<\?)(.*?)(\?>)#i", '', $str);
 
         // strip smarty scripts
-        $str = mb_eregi_replace("(\{\w)(.*?)(\})", '', $str);
+        $str = preg_replace("#(\{\w)(.*?)(\})#i", '', $str);
 
         return $str;
     }
diff --git a/src/PHPHtmlParser/Dom/TextNode.php b/src/PHPHtmlParser/Dom/TextNode.php
index 0a3d8773..130d1c5b 100644
--- a/src/PHPHtmlParser/Dom/TextNode.php
+++ b/src/PHPHtmlParser/Dom/TextNode.php
@@ -38,7 +38,7 @@ class TextNode extends LeafNode
     public function __construct($text)
     {
         // remove double spaces
-        $text = mb_ereg_replace('\s+', ' ', $text);
+        $text = preg_replace('#\s+#', ' ', $text);
 
         // restore line breaks
         $text = str_replace('&#10;', "\n", $text);

From 95f8d0ccae8b169feb64607934c73b4180633def Mon Sep 17 00:00:00 2001
From: Andreas Braun <git@alcaeus.org>
Date: Wed, 10 Jan 2018 10:52:55 +0100
Subject: [PATCH 3/7] Use relative file paths in tests

---
 tests/DomTest.php             | 16 ++++++++--------
 tests/Options/CleanupTest.php | 12 ++++++------
 tests/StaticDomTest.php       | 10 +++++-----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/tests/DomTest.php b/tests/DomTest.php
index 9a13ee95..ce854f5e 100644
--- a/tests/DomTest.php
+++ b/tests/DomTest.php
@@ -147,21 +147,21 @@ public function testLoadUpperCase()
     public function testLoadWithFile()
     {
         $dom = new Dom;
-        $dom->loadFromFile('tests/files/small.html');
+        $dom->loadFromFile(__DIR__ . '/files/small.html');
         $this->assertEquals('VonBurgermeister', $dom->find('.post-user font', 0)->text);
     }
 
     public function testLoadFromFile()
     {
         $dom = new Dom;
-        $dom->loadFromFile('tests/files/small.html');
+        $dom->loadFromFile(__DIR__ . '/files/small.html');
         $this->assertEquals('VonBurgermeister', $dom->find('.post-user font', 0)->text);
     }
 
     public function testLoadFromFileFind()
     {
         $dom = new Dom;
-        $dom->loadFromFile('tests/files/small.html');
+        $dom->loadFromFile(__DIR__ . '/files/small.html');
         $this->assertEquals('VonBurgermeister', $dom->find('.post-row div .post-user font', 0)->text);
     }
 
@@ -175,14 +175,14 @@ public function testLoadUtf8()
     public function testLoadFileBig()
     {
         $dom = new Dom;
-        $dom->loadFromFile('tests/files/big.html');
+        $dom->loadFromFile(__DIR__ . '/files/big.html');
         $this->assertEquals(10, count($dom->find('.content-border')));
     }
 
     public function testLoadFileBigTwice()
     {
         $dom = new Dom;
-        $dom->loadFromFile('tests/files/big.html');
+        $dom->loadFromFile(__DIR__ . '/files/big.html');
         $post = $dom->find('.post-row', 0);
         $this->assertEquals(' <p>Журчанье воды<br /> Черно-белые тени<br /> Вновь на фонтане</p> ', $post->find('.post-message', 0)->innerHtml);
     }
@@ -190,7 +190,7 @@ public function testLoadFileBigTwice()
     public function testLoadFileBigTwicePreserveOption()
     {
         $dom = new Dom;
-        $dom->loadFromFile('tests/files/big.html', ['preserveLineBreaks' => true]);
+        $dom->loadFromFile(__DIR__ . '/files/big.html', ['preserveLineBreaks' => true]);
         $post = $dom->find('.post-row', 0);
         $this->assertEquals('<p>Журчанье воды<br />
 Черно-белые тени<br />
@@ -203,7 +203,7 @@ public function testLoadFromUrl()
         $curl->shouldReceive('get')
              ->once()
              ->with('http://google.com')
-             ->andReturn(file_get_contents('tests/files/small.html'));
+             ->andReturn(file_get_contents(__DIR__ . '/files/small.html'));
         
         $dom = new Dom;
         $dom->loadFromUrl('http://google.com', [], $curl);
@@ -262,7 +262,7 @@ public function testGetElementsByClass()
     public function testEnforceEncoding()
     {
         $dom = new Dom;
-        $dom->load('tests/files/horrible.html', [
+        $dom->load(__DIR__ . '/files/horrible.html', [
             'enforceEncoding' => 'UTF-8',
         ]);
         $this->assertNotEquals('<input type="submit" tabindex="0" name="submit" value="Информации" />', $dom->find('table input', 1)->outerHtml);
diff --git a/tests/Options/CleanupTest.php b/tests/Options/CleanupTest.php
index 44539651..668e3931 100644
--- a/tests/Options/CleanupTest.php
+++ b/tests/Options/CleanupTest.php
@@ -10,7 +10,7 @@ public function testCleanupInputTrue()
         $dom->setOptions([
             'cleanupInput' => true,
         ]);
-        $dom->loadFromFile('tests/files/horrible.html');
+        $dom->loadFromFile(__DIR__ . '/../files/horrible.html');
         $this->assertEquals(0, count($dom->find('style')));
         $this->assertEquals(0, count($dom->find('script')));
     }
@@ -21,7 +21,7 @@ public function testCleanupInputFalse()
         $dom->setOptions([
             'cleanupInput' => false,
         ]);
-        $dom->loadFromFile('tests/files/horrible.html');
+        $dom->loadFromFile(__DIR__ . '/../files/horrible.html');
         $this->assertEquals(1, count($dom->find('style')));
         $this->assertEquals(1, count($dom->find('script')));
     }
@@ -32,7 +32,7 @@ public function testRemoveStylesTrue()
         $dom->setOptions([
             'removeStyles' => true,
         ]);
-        $dom->loadFromFile('tests/files/horrible.html');
+        $dom->loadFromFile(__DIR__ . '/../files/horrible.html');
         $this->assertEquals(0, count($dom->find('style')));
     }
 
@@ -42,7 +42,7 @@ public function testRemoveStylesFalse()
         $dom->setOptions([
             'removeStyles' => false,
         ]);
-        $dom->loadFromFile('tests/files/horrible.html');
+        $dom->loadFromFile(__DIR__ . '/../files/horrible.html');
         $this->assertEquals(1, count($dom->find('style')));
         $this->assertEquals('text/css',
             $dom->find('style')->getAttribute('type'));
@@ -54,7 +54,7 @@ public function testRemoveScriptsTrue()
         $dom->setOptions([
             'removeScripts' => true,
         ]);
-        $dom->loadFromFile('tests/files/horrible.html');
+        $dom->loadFromFile(__DIR__ . '/../files/horrible.html');
         $this->assertEquals(0, count($dom->find('script')));
     }
 
@@ -64,7 +64,7 @@ public function testRemoveScriptsFalse()
         $dom->setOptions([
             'removeScripts' => false,
         ]);
-        $dom->loadFromFile('tests/files/horrible.html');
+        $dom->loadFromFile(__DIR__ . '/../files/horrible.html');
         $this->assertEquals(1, count($dom->find('script')));
         $this->assertEquals('text/JavaScript',
             $dom->find('script')->getAttribute('type'));
diff --git a/tests/StaticDomTest.php b/tests/StaticDomTest.php
index ad6c218a..34ef2953 100644
--- a/tests/StaticDomTest.php
+++ b/tests/StaticDomTest.php
@@ -31,19 +31,19 @@ public function testLoad()
 
     public function testLoadWithFile()
     {
-        $dom = Dom::load('tests/files/small.html');
+        $dom = Dom::load(__DIR__ . '/files/small.html');
         $this->assertEquals('VonBurgermeister', $dom->find('.post-user font', 0)->text);
     }
 
     public function testLoadFromFile()
     {
-        $dom = Dom::loadFromFile('tests/files/small.html');
+        $dom = Dom::loadFromFile(__DIR__ . '/files/small.html');
         $this->assertEquals('VonBurgermeister', $dom->find('.post-user font', 0)->text);
     }
 
     public function testFind()
     {
-        Dom::load('tests/files/horrible.html');
+        Dom::load(__DIR__ . '/files/horrible.html');
         $this->assertEquals('<input type="submit" tabindex="0" name="submit" value="Информации" />', Dom::find('table input', 1)->outerHtml);
     }
 
@@ -57,7 +57,7 @@ public function testFindNoLoad()
 
     public function testFindI()
     {
-        Dom::load('tests/files/horrible.html');
+        Dom::load(__DIR__ . '/files/horrible.html');
         $this->assertEquals('[ Досие бр:12928 ]', Dom::find('i')[0]->innerHtml);
     }
 
@@ -67,7 +67,7 @@ public function testLoadFromUrl()
         $curl->shouldReceive('get')
              ->once()
              ->with('http://google.com')
-             ->andReturn(file_get_contents('tests/files/small.html'));
+             ->andReturn(file_get_contents(__DIR__ . '/files/small.html'));
 
         Dom::loadFromUrl('http://google.com', [], $curl);
         $this->assertEquals('VonBurgermeister', Dom::find('.post-row div .post-user font', 0)->text);

From 1b39fa02352475065018bd2a74aaef945c1d63fd Mon Sep 17 00:00:00 2001
From: Andreas Braun <git@alcaeus.org>
Date: Wed, 10 Jan 2018 11:02:31 +0100
Subject: [PATCH 4/7] Don't call DOM method statically

---
 tests/StaticDomTest.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/StaticDomTest.php b/tests/StaticDomTest.php
index 34ef2953..4d0b38c7 100644
--- a/tests/StaticDomTest.php
+++ b/tests/StaticDomTest.php
@@ -24,26 +24,26 @@ public function testMountWithDom()
 
     public function testLoad()
     {
-        $dom = Dom::load('<div class="all"><p>Hey bro, <a href="google.com">click here</a><br /> :)</p></div>');
+        $dom = StaticDom::load('<div class="all"><p>Hey bro, <a href="google.com">click here</a><br /> :)</p></div>');
         $div = $dom->find('div', 0);
         $this->assertEquals('<div class="all"><p>Hey bro, <a href="google.com">click here</a><br /> :)</p></div>', $div->outerHtml);
     }
 
     public function testLoadWithFile()
     {
-        $dom = Dom::load(__DIR__ . '/files/small.html');
+        $dom = StaticDom::load(__DIR__ . '/files/small.html');
         $this->assertEquals('VonBurgermeister', $dom->find('.post-user font', 0)->text);
     }
 
     public function testLoadFromFile()
     {
-        $dom = Dom::loadFromFile(__DIR__ . '/files/small.html');
+        $dom = StaticDom::loadFromFile(__DIR__ . '/files/small.html');
         $this->assertEquals('VonBurgermeister', $dom->find('.post-user font', 0)->text);
     }
 
     public function testFind()
     {
-        Dom::load(__DIR__ . '/files/horrible.html');
+        StaticDom::load(__DIR__ . '/files/horrible.html');
         $this->assertEquals('<input type="submit" tabindex="0" name="submit" value="Информации" />', Dom::find('table input', 1)->outerHtml);
     }
 
@@ -52,13 +52,13 @@ public function testFind()
      */
     public function testFindNoLoad()
     {
-        Dom::find('.post-user font', 0);
+        StaticDom::find('.post-user font', 0);
     }
 
     public function testFindI()
     {
-        Dom::load(__DIR__ . '/files/horrible.html');
-        $this->assertEquals('[ Досие бр:12928 ]', Dom::find('i')[0]->innerHtml);
+        StaticDom::load(__DIR__ . '/files/horrible.html');
+        $this->assertEquals('[ Досие бр:12928 ]', StaticDom::find('i')[0]->innerHtml);
     }
 
     public function testLoadFromUrl()
@@ -69,8 +69,8 @@ public function testLoadFromUrl()
              ->with('http://google.com')
              ->andReturn(file_get_contents(__DIR__ . '/files/small.html'));
 
-        Dom::loadFromUrl('http://google.com', [], $curl);
-        $this->assertEquals('VonBurgermeister', Dom::find('.post-row div .post-user font', 0)->text);
+        StaticDom::loadFromUrl('http://google.com', [], $curl);
+        $this->assertEquals('VonBurgermeister', StaticDom::find('.post-row div .post-user font', 0)->text);
     }
 
 }

From dafa8b4a3729223c0dc4ec3e5ce79d258c4e0d13 Mon Sep 17 00:00:00 2001
From: Andreas Braun <git@alcaeus.org>
Date: Wed, 10 Jan 2018 11:08:06 +0100
Subject: [PATCH 5/7] Update to PHPUnit 6

---
 tests/CollectionTest.php                 |  7 ++++---
 tests/ContentTest.php                    |  3 ++-
 tests/DomTest.php                        |  8 ++++----
 tests/Node/ChildrenTest.php              | 25 ++++++++++++------------
 tests/Node/HtmlTest.php                  | 15 +++++++-------
 tests/Node/ParentTest.php                | 19 +++++++++---------
 tests/Node/TagTest.php                   |  3 ++-
 tests/Node/TextTest.php                  |  3 ++-
 tests/Options/CleanupTest.php            |  3 ++-
 tests/Options/PreserveLineBreaks.php     |  3 ++-
 tests/Options/StrictTest.php             |  3 ++-
 tests/Options/WhitespaceTextNodeTest.php |  3 ++-
 tests/OptionsTest.php                    |  3 ++-
 tests/SelectorTest.php                   |  3 ++-
 tests/StaticDomTest.php                  |  8 ++++----
 15 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/tests/CollectionTest.php b/tests/CollectionTest.php
index 6204f954..a7d04af3 100644
--- a/tests/CollectionTest.php
+++ b/tests/CollectionTest.php
@@ -4,8 +4,9 @@
 use PHPHtmlParser\Dom\HtmlNode;
 use PHPHtmlParser\Dom\Tag;
 use PHPHtmlParser\Dom\Collection;
+use PHPUnit\Framework\TestCase;
 
-class CollectionTest extends PHPUnit_Framework_TestCase {
+class CollectionTest extends TestCase {
     
     public function testEach()
     {
@@ -29,10 +30,10 @@ public function testEach()
     }
 
     /**
-     * @expectedException PHPHtmlParser\Exceptions\EmptyCollectionException
      */
     public function testCallNoNodes()
     {
+        $this->expectException('PHPHtmlParser\Exceptions\EmptyCollectionException');
         $collection = new Collection();
         $collection->innerHtml();
     }
@@ -70,10 +71,10 @@ public function testGetMagic()
     }
 
     /**
-     * @expectedException PHPHtmlParser\Exceptions\EmptyCollectionException
      */
     public function testGetNoNodes()
     {
+        $this->expectException('PHPHtmlParser\Exceptions\EmptyCollectionException');
         $collection = new Collection();
         $collection->innerHtml;
     }
diff --git a/tests/ContentTest.php b/tests/ContentTest.php
index 0a3fb8e3..6dc45c8d 100644
--- a/tests/ContentTest.php
+++ b/tests/ContentTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Content;
+use PHPUnit\Framework\TestCase;
 
-class ContentTest extends PHPUnit_Framework_TestCase {
+class ContentTest extends TestCase {
 
     public function testChar()
     {
diff --git a/tests/DomTest.php b/tests/DomTest.php
index ce854f5e..7ddd4a0b 100644
--- a/tests/DomTest.php
+++ b/tests/DomTest.php
@@ -1,8 +1,10 @@
 <?php
 
 use PHPHtmlParser\Dom;
+use PHPHtmlParser\Exceptions\NotLoadedException;
+use PHPUnit\Framework\TestCase;
 
-class DomTest extends PHPUnit_Framework_TestCase {
+class DomTest extends TestCase {
 
     public function tearDown()
     {
@@ -17,11 +19,9 @@ public function testLoad()
         $this->assertEquals('<div class="all"><p>Hey bro, <a href="google.com">click here</a><br /> :)</p></div>', $div->outerHtml);
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\NotLoadedException
-     */
     public function testNotLoaded()
     {
+        $this->expectException(NotLoadedException::class);
         $dom = new Dom;
         $div = $dom->find('div', 0);
     }
diff --git a/tests/Node/ChildrenTest.php b/tests/Node/ChildrenTest.php
index e8b822da..ce055c77 100644
--- a/tests/Node/ChildrenTest.php
+++ b/tests/Node/ChildrenTest.php
@@ -1,8 +1,11 @@
 <?php
 
 use PHPHtmlParser\Dom\MockNode as Node;
+use PHPHtmlParser\Exceptions\ChildNotFoundException;
+use PHPHtmlParser\Exceptions\ParentNotFoundException;
+use PHPUnit\Framework\TestCase;
 
-class NodeChildTest extends PHPUnit_Framework_TestCase {
+class NodeChildTest extends TestCase {
 
     public function testGetParent()
     {
@@ -32,22 +35,20 @@ public function testNextSibling()
         $this->assertEquals($child2->id(), $child->nextSibling()->id());
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\ChildNotFoundException
-     */
     public function testNextSiblingNotFound()
     {
+        $this->expectException(ChildNotFoundException::class);
+
         $parent = new Node;
         $child  = new Node;
         $child->setParent($parent);
         $child->nextSibling();
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\ParentNotFoundException
-     */
     public function testNextSiblingNoParent()
     {
+        $this->expectException(ParentNotFoundException::class);
+
         $child = new Node;
         $child->nextSibling();
     }
@@ -62,22 +63,20 @@ public function testPreviousSibling()
         $this->assertEquals($child->id(), $child2->previousSibling()->id());
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\ChildNotFoundException
-     */
     public function testPreviousSiblingNotFound()
     {
+        $this->expectException(ChildNotFoundException::class);
+
         $parent = new Node;
         $node = new Node;
         $node->setParent($parent);
         $node->previousSibling();
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\ParentNotFoundException
-     */
     public function testPreviousSiblingNoParent()
     {
+        $this->expectException(ParentNotFoundException::class);
+
         $child = new Node;
         $child->previousSibling();
     }
diff --git a/tests/Node/HtmlTest.php b/tests/Node/HtmlTest.php
index e6998305..97f505cf 100644
--- a/tests/Node/HtmlTest.php
+++ b/tests/Node/HtmlTest.php
@@ -5,8 +5,11 @@
 use PHPHtmlParser\Dom\TextNode;
 use PHPHtmlParser\Dom\MockNode;
 use PHPHtmlParser\Dom\Tag;
+use PHPHtmlParser\Exceptions\ParentNotFoundException;
+use PHPHtmlParser\Exceptions\UnknownChildTypeException;
+use PHPUnit\Framework\TestCase;
 
-class NodeHtmlTest extends PHPUnit_Framework_TestCase {
+class NodeHtmlTest extends TestCase {
 
     public function testInnerHtml()
     {
@@ -65,11 +68,10 @@ public function testInnerHtmlTwice()
         $this->assertEquals($inner, $parent->innerHtml());
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\UnknownChildTypeException
-     */
     public function testInnerHtmlUnkownChild()
     {
+        $this->expectException(UnknownChildTypeException::class);
+
         $div = new Tag('div');
         $div->setAttributes([
             'class' => [
@@ -447,11 +449,10 @@ public function testIterator()
         $this->assertEquals(2, $children);
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\ParentNotFoundException
-     */
     public function testAncestorByTagFailure()
     {
+        $this->expectException(ParentNotFoundException::class);
+
         $a    = new Tag('a');
         $node = new HtmlNode($a);
         $node->ancestorByTag('div');
diff --git a/tests/Node/ParentTest.php b/tests/Node/ParentTest.php
index 9170c947..3d0a4598 100644
--- a/tests/Node/ParentTest.php
+++ b/tests/Node/ParentTest.php
@@ -1,8 +1,10 @@
 <?php
 
 use PHPHtmlParser\Dom\MockNode as Node;
+use PHPHtmlParser\Exceptions\CircularException;
+use PHPUnit\Framework\TestCase;
 
-class NodeParentTest extends PHPUnit_Framework_TestCase {
+class NodeParentTest extends TestCase {
 
     public function testHasChild()
     {
@@ -150,33 +152,30 @@ public function testReplaceChild()
         $this->assertFalse($parent->isChild($child->id()));
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\CircularException
-     */
     public function testSetParentDescendantException()
     {
+        $this->expectException(CircularException::class);
+
         $parent = new Node;
         $child  = new Node;
         $parent->addChild($child);
         $parent->setParent($child);
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\CircularException
-     */
     public function testAddChildAncestorException()
     {
+        $this->expectException(CircularException::class);
+
         $parent = new Node;
         $child  = new Node;
         $parent->addChild($child);
         $child->addChild($parent);
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\CircularException
-     */
     public function testAddItselfAsChild()
     {
+        $this->expectException(CircularException::class);
+
         $parent = new Node;
         $parent->addChild($parent);
     }
diff --git a/tests/Node/TagTest.php b/tests/Node/TagTest.php
index b3a528db..2bc080e8 100644
--- a/tests/Node/TagTest.php
+++ b/tests/Node/TagTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Dom\Tag;
+use PHPUnit\Framework\TestCase;
 
-class NodeTagTest extends PHPUnit_Framework_TestCase {
+class NodeTagTest extends TestCase {
 
     public function testSelfClosing()
     {
diff --git a/tests/Node/TextTest.php b/tests/Node/TextTest.php
index 022dc842..7aa3322f 100644
--- a/tests/Node/TextTest.php
+++ b/tests/Node/TextTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Dom\TextNode;
+use PHPUnit\Framework\TestCase;
 
-class NodeTextTest extends PHPUnit_Framework_TestCase {
+class NodeTextTest extends TestCase {
 
     public function testText()
     {
diff --git a/tests/Options/CleanupTest.php b/tests/Options/CleanupTest.php
index 668e3931..5a12d6e3 100644
--- a/tests/Options/CleanupTest.php
+++ b/tests/Options/CleanupTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Dom;
+use PHPUnit\Framework\TestCase;
 
-class CleanupTest extends PHPUnit_Framework_TestCase {
+class CleanupTest extends TestCase {
 
     public function testCleanupInputTrue()
     {
diff --git a/tests/Options/PreserveLineBreaks.php b/tests/Options/PreserveLineBreaks.php
index 7547b7a8..d86e25a7 100644
--- a/tests/Options/PreserveLineBreaks.php
+++ b/tests/Options/PreserveLineBreaks.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Dom;
+use PHPUnit\Framework\TestCase;
 
-class PreserveLineBreaks extends PHPUnit_Framework_TestCase {
+class PreserveLineBreaks extends TestCase {
 
     public function testPreserveLineBreakTrue()
     {
diff --git a/tests/Options/StrictTest.php b/tests/Options/StrictTest.php
index 516a99cb..bbb0d81a 100644
--- a/tests/Options/StrictTest.php
+++ b/tests/Options/StrictTest.php
@@ -2,8 +2,9 @@
 
 use PHPHtmlParser\Dom;
 use PHPHtmlParser\Exceptions\StrictException;
+use PHPUnit\Framework\TestCase;
 
-class StrictTest extends PHPUnit_Framework_TestCase {
+class StrictTest extends TestCase {
 
     public function testConfigStrict()
     {
diff --git a/tests/Options/WhitespaceTextNodeTest.php b/tests/Options/WhitespaceTextNodeTest.php
index cdafcdcc..e0135932 100644
--- a/tests/Options/WhitespaceTextNodeTest.php
+++ b/tests/Options/WhitespaceTextNodeTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Dom;
+use PHPUnit\Framework\TestCase;
 
-class WhitespaceTextNodeTest extends PHPUnit_Framework_TestCase {
+class WhitespaceTextNodeTest extends TestCase {
 
     public function testConfigGlobalNoWhitespaceTextNode()
     {
diff --git a/tests/OptionsTest.php b/tests/OptionsTest.php
index 12a08eec..185a2aa7 100644
--- a/tests/OptionsTest.php
+++ b/tests/OptionsTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Options;
+use PHPUnit\Framework\TestCase;
 
-class OptionsTest extends PHPUnit_Framework_TestCase {
+class OptionsTest extends TestCase {
 
     public function testDefaultWhitespaceTextNode()
     {
diff --git a/tests/SelectorTest.php b/tests/SelectorTest.php
index 1b31afa0..5a65943b 100644
--- a/tests/SelectorTest.php
+++ b/tests/SelectorTest.php
@@ -3,8 +3,9 @@
 use PHPHtmlParser\Selector;
 use PHPHtmlParser\Dom\HtmlNode;
 use PHPHtmlParser\Dom\Tag;
+use PHPUnit\Framework\TestCase;
 
-class SelectorTest extends PHPUnit_Framework_TestCase {
+class SelectorTest extends TestCase {
     
     public function testParseSelectorStringId()
     {
diff --git a/tests/StaticDomTest.php b/tests/StaticDomTest.php
index 4d0b38c7..9d946379 100644
--- a/tests/StaticDomTest.php
+++ b/tests/StaticDomTest.php
@@ -1,8 +1,10 @@
 <?php
 
+use PHPHtmlParser\Exceptions\NotLoadedException;
 use PHPHtmlParser\StaticDom;
+use PHPUnit\Framework\TestCase;
 
-class StaticDomTest extends PHPUnit_Framework_TestCase {
+class StaticDomTest extends TestCase {
 
     public function setUp()
     {
@@ -47,11 +49,9 @@ public function testFind()
         $this->assertEquals('<input type="submit" tabindex="0" name="submit" value="Информации" />', Dom::find('table input', 1)->outerHtml);
     }
 
-    /**
-     * @expectedException PHPHtmlParser\Exceptions\NotLoadedException
-     */
     public function testFindNoLoad()
     {
+        $this->expectException(NotLoadedException::class);
         StaticDom::find('.post-user font', 0);
     }
 

From 28c7ddabbe242b5cdfc4c14cf2fa181e72b53e32 Mon Sep 17 00:00:00 2001
From: Andreas Braun <git@alcaeus.org>
Date: Wed, 10 Jan 2018 11:24:24 +0100
Subject: [PATCH 6/7] Fix use of count in PHP 7.2

---
 src/PHPHtmlParser/Selector.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/PHPHtmlParser/Selector.php b/src/PHPHtmlParser/Selector.php
index e0e1ac73..c378728a 100644
--- a/src/PHPHtmlParser/Selector.php
+++ b/src/PHPHtmlParser/Selector.php
@@ -168,8 +168,7 @@ protected function parseSelectorString($selector)
     protected function seek(array $nodes, array $rule, array $options)
     {
         // XPath index
-        if (count($rule['tag']) > 0 &&
-            count($rule['key']) > 0 &&
+        if (!empty($rule['tag']) &&
             is_numeric($rule['key'])
         ) {
             $count = 0;

From cf75e1a7181d6fd04051172e6bc9b78637d958ad Mon Sep 17 00:00:00 2001
From: Andreas Braun <git@alcaeus.org>
Date: Wed, 10 Jan 2018 11:37:43 +0100
Subject: [PATCH 7/7] Update branch-alias to 1.8.x

---
 composer.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/composer.json b/composer.json
index 4b8494cf..bb7115f4 100644
--- a/composer.json
+++ b/composer.json
@@ -33,5 +33,10 @@
         "psr-0": {
             "PHPHtmlParser": "src/"
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.8.x-dev"
+        }
     }
 }