From ff6c667cadb446d3748d364e5b1976925d23ff25 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 10 Oct 2022 13:47:48 +0300
Subject: [PATCH 01/15] Fix PHP 8.1 compatibility of Collection::offsetGet.

---
 src/PHPHtmlParser/Dom/Node/Collection.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/PHPHtmlParser/Dom/Node/Collection.php b/src/PHPHtmlParser/Dom/Node/Collection.php
index ff447259..543b7eca 100644
--- a/src/PHPHtmlParser/Dom/Node/Collection.php
+++ b/src/PHPHtmlParser/Dom/Node/Collection.php
@@ -130,6 +130,7 @@ public function offsetUnset($offset): void
      *
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->collection[$offset] ?? null;

From f2097c64d22612c2db01d542d1510a71c7b77fec Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 10 Oct 2022 13:54:10 +0300
Subject: [PATCH 02/15] Update dependencies and tests for PHP 8.1
 compatibility.

Bumps minimum PHP version to 7.4.7.
---
 composer.json                              |  30 +++--
 src/PHPHtmlParser/DTO/Tag/AttributeDTO.php |   4 +-
 tests/CollectionTest.php                   |  30 +++--
 tests/ContentTest.php                      |  26 ++---
 tests/Dom/CleanerTest.php                  |   2 +-
 tests/Dom/CommentTest.php                  |   6 +-
 tests/Dom/LoadTest.php                     |  30 ++---
 tests/Dom/NotLoadedTest.php                |   6 +-
 tests/DomTest.php                          | 122 ++++++++++-----------
 tests/Node/ChildrenTest.php                |  38 +++----
 tests/Node/HtmlTest.php                    |  69 ++++++------
 tests/Node/ParentTest.php                  |  66 +++++------
 tests/Node/TagTest.php                     |  40 ++++---
 tests/Node/TextTest.php                    |  18 +--
 tests/Options/CleanupTest.php              |  16 +--
 tests/Options/NoSlashTest.php              |   6 +-
 tests/Options/PreserveLineBreaks.php       |   4 +-
 tests/Options/SelfClosingTest.php          |   8 +-
 tests/Options/StrictTest.php               |   8 +-
 tests/Options/WhitespaceTextNodeTest.php   |   4 +-
 tests/OptionsTest.php                      |   8 +-
 tests/Selector/SeekerTest.php              |   2 +-
 tests/Selector/SelectorTest.php            |  32 +++---
 tests/StaticDomTest.php                    |  22 ++--
 24 files changed, 291 insertions(+), 306 deletions(-)

diff --git a/composer.json b/composer.json
index 166886f7..16775751 100755
--- a/composer.json
+++ b/composer.json
@@ -10,29 +10,39 @@
             "name": "Gilles Paquette",
             "email": "paquettg@gmail.com",
             "homepage": "http://gillespaquette.ca"
+        },
+        {
+            "name": "Ere Maijala",
+            "email": "ere.maijala@helsinki.fi",
+            "homepage": "http://nationallibrary.fi"
         }
     ],
     "require": {
-        "php": ">=7.2",
+        "php": ">=7.4",
         "ext-mbstring": "*",
         "ext-zlib": "*",
         "ext-curl": "*",
         "paquettg/string-encode": "~1.0.0",
-        "php-http/httplug": "^2.1",
-        "guzzlehttp/guzzle": "^7.0",
-        "guzzlehttp/psr7": "^1.6",
-        "myclabs/php-enum": "^1.7"
+        "php-http/httplug": "^2.3.0",
+        "guzzlehttp/guzzle": "^7.5.0",
+        "guzzlehttp/psr7": "^2.4.1",
+        "myclabs/php-enum": "^1.8.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5.1",
+        "phpunit/phpunit": "^9.5.25",
         "mockery/mockery": "^1.2",
-        "infection/infection": "^0.13.4",
-        "phan/phan": "^2.4",
-        "friendsofphp/php-cs-fixer": "^2.16"
+        "infection/infection": "^0.26.6",
+        "phan/phan": "^5.4.1",
+        "friendsofphp/php-cs-fixer": "^3.11.0"
     },
     "autoload": {
-        "psr-4": { 
+        "psr-4": {
         	"PHPHtmlParser\\": "src/PHPHtmlParser"
        	}
+    },
+    "config": {
+        "allow-plugins": {
+            "infection/extension-installer": false
+        }
     }
 }
diff --git a/src/PHPHtmlParser/DTO/Tag/AttributeDTO.php b/src/PHPHtmlParser/DTO/Tag/AttributeDTO.php
index 3e7e1824..773d7795 100755
--- a/src/PHPHtmlParser/DTO/Tag/AttributeDTO.php
+++ b/src/PHPHtmlParser/DTO/Tag/AttributeDTO.php
@@ -55,6 +55,8 @@ public function htmlspecialcharsDecode(): void
      */
     public function encodeValue(Encode $encode)
     {
-        $this->value = $encode->convert($this->value);
+        if (null !== $this->value) {
+            $this->value = $encode->convert($this->value);
+        }
     }
 }
diff --git a/tests/CollectionTest.php b/tests/CollectionTest.php
index c11c667c..a628c9b9 100755
--- a/tests/CollectionTest.php
+++ b/tests/CollectionTest.php
@@ -11,7 +11,7 @@
 
 class CollectionTest extends TestCase
 {
-    public function testEach()
+    public function testEach(): void
     {
         $root = new HtmlNode(new Tag('root'));
         $parent = new HtmlNode(new Tag('div'));
@@ -32,23 +32,21 @@ public function testEach()
         $this->assertEquals(2, $count);
     }
 
-    /**
-     * @expectedException \PHPHtmlParser\Exceptions\EmptyCollectionException
-     */
-    public function testCallNoNodes()
+    public function testCallNoNodes(): void
     {
         $collection = new Collection();
+        $this->expectException(\PHPHtmlParser\Exceptions\EmptyCollectionException::class);
         $collection->innerHtml();
     }
 
-    public function testNoNodeString()
+    public function testNoNodeString(): void
     {
         $collection = new Collection();
         $string = (string) $collection;
         $this->assertEmpty($string);
     }
 
-    public function testCallMagic()
+    public function testCallMagic(): void
     {
         $root = new HtmlNode(new Tag('root'));
         $parent = new HtmlNode(new Tag('div'));
@@ -64,7 +62,7 @@ public function testCallMagic()
         $this->assertEquals($child3->id(), $selector->find($root)->id());
     }
 
-    public function testGetMagic()
+    public function testGetMagic(): void
     {
         $root = new HtmlNode(new Tag('root'));
         $parent = new HtmlNode(new Tag('div'));
@@ -80,16 +78,14 @@ public function testGetMagic()
         $this->assertEquals($child3->innerHtml, $selector->find($root)->innerHtml);
     }
 
-    /**
-     * @expectedException \PHPHtmlParser\Exceptions\EmptyCollectionException
-     */
-    public function testGetNoNodes()
+    public function testGetNoNodes(): void
     {
         $collection = new Collection();
+        $this->expectException(\PHPHtmlParser\Exceptions\EmptyCollectionException::class);
         $collection->innerHtml;
     }
 
-    public function testToStringMagic()
+    public function testToStringMagic(): void
     {
         $root = new HtmlNode(new Tag('root'));
         $parent = new HtmlNode(new Tag('div'));
@@ -105,7 +101,7 @@ public function testToStringMagic()
         $this->assertEquals((string) $child3, (string) $selector->find($root));
     }
 
-    public function testToArray()
+    public function testToArray(): void
     {
         $root = new HtmlNode(new Tag('root'));
         $parent = new HtmlNode(new Tag('div'));
@@ -124,21 +120,21 @@ public function testToArray()
         $this->assertEquals($child3->id(), $lastA->id());
     }
 
-    public function testGetIterator()
+    public function testGetIterator(): void
     {
         $collection = new Collection();
         $iterator = $collection->getIterator();
         $this->assertTrue($iterator instanceof \ArrayIterator);
     }
 
-    public function testOffsetSet()
+    public function testOffsetSet(): void
     {
         $collection = new Collection();
         $collection->offsetSet(7, true);
         $this->assertTrue($collection->offsetGet(7));
     }
 
-    public function testOffsetUnset()
+    public function testOffsetUnset(): void
     {
         $collection = new Collection();
         $collection->offsetSet(7, true);
diff --git a/tests/ContentTest.php b/tests/ContentTest.php
index c6d25edb..3942b9f7 100755
--- a/tests/ContentTest.php
+++ b/tests/ContentTest.php
@@ -8,26 +8,26 @@
 
 class ContentTest extends TestCase
 {
-    public function testChar()
+    public function testChar(): void
     {
         $content = new Content('abcde');
         $this->assertEquals('a', $content->char());
     }
 
-    public function testCharSelection()
+    public function testCharSelection(): void
     {
         $content = new Content('abcde');
         $this->assertEquals('d', $content->char(3));
     }
 
-    public function testFastForward()
+    public function testFastForward(): void
     {
         $content = new Content('abcde');
         $content->fastForward(2);
         $this->assertEquals('c', $content->char());
     }
 
-    public function testRewind()
+    public function testRewind(): void
     {
         $content = new Content('abcde');
         $content->fastForward(2)
@@ -35,7 +35,7 @@ public function testRewind()
         $this->assertEquals('b', $content->char());
     }
 
-    public function testRewindNegative()
+    public function testRewindNegative(): void
     {
         $content = new Content('abcde');
         $content->fastForward(2)
@@ -43,51 +43,51 @@ public function testRewindNegative()
         $this->assertEquals('a', $content->char());
     }
 
-    public function testCopyUntil()
+    public function testCopyUntil(): void
     {
         $content = new Content('abcdeedcba');
         $this->assertEquals('abcde', $content->copyUntil('ed'));
     }
 
-    public function testCopyUntilChar()
+    public function testCopyUntilChar(): void
     {
         $content = new Content('abcdeedcba');
         $this->assertEquals('ab', $content->copyUntil('edc', true));
     }
 
-    public function testCopyUntilEscape()
+    public function testCopyUntilEscape(): void
     {
         $content = new Content('foo\"bar"bax');
         $this->assertEquals('foo\"bar', $content->copyUntil('"', false, true));
     }
 
-    public function testCopyUntilNotFound()
+    public function testCopyUntilNotFound(): void
     {
         $content = new Content('foo\"bar"bax');
         $this->assertEquals('foo\"bar"bax', $content->copyUntil('baz'));
     }
 
-    public function testCopyByToken()
+    public function testCopyByToken(): void
     {
         $content = new Content('<a href="google.com">');
         $content->fastForward(3);
         $this->assertEquals('href="google.com"', $content->copyByToken(StringToken::ATTR(), true));
     }
 
-    public function testSkip()
+    public function testSkip(): void
     {
         $content = new Content('abcdefghijkl');
         $content->skip('abcd');
         $this->assertEquals('e', $content->char());
     }
 
-    public function testSkipCopy()
+    public function testSkipCopy(): void
     {
         $content = new Content('abcdefghijkl');
         $this->assertEquals('abcd', $content->skip('abcd', true));
     }
 
-    public function testSkipByToken()
+    public function testSkipByToken(): void
     {
         $content = new Content(' b c');
         $content->fastForward(1);
diff --git a/tests/Dom/CleanerTest.php b/tests/Dom/CleanerTest.php
index 3ff32506..d3e2fe02 100644
--- a/tests/Dom/CleanerTest.php
+++ b/tests/Dom/CleanerTest.php
@@ -8,7 +8,7 @@
 
 class CleanerTest extends TestCase
 {
-    public function testCleanEregiFailureFile()
+    public function testCleanEregiFailureFile(): void
     {
         $cleaner = new Cleaner();
         $string = $cleaner->clean(\file_get_contents('tests/data/files/mvEregiReplaceFailure.html'), new Options(), 'utf-8');
diff --git a/tests/Dom/CommentTest.php b/tests/Dom/CommentTest.php
index 3f10696e..a26a3098 100644
--- a/tests/Dom/CommentTest.php
+++ b/tests/Dom/CommentTest.php
@@ -13,7 +13,7 @@ class CommentTest extends TestCase
      */
     private $dom;
 
-    public function setUp()
+    public function setUp(): void
     {
         $dom = new Dom();
         $options = new Options();
@@ -22,12 +22,12 @@ public function setUp()
         $this->dom = $dom;
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
     }
 
-    public function testLoadCommentInnerHtml()
+    public function testLoadCommentInnerHtml(): void
     {
         $this->assertEquals('<!-- test comment with number 2 -->', $this->dom->innerHtml);
     }
diff --git a/tests/Dom/LoadTest.php b/tests/Dom/LoadTest.php
index 456afb88..e7ac5dc6 100644
--- a/tests/Dom/LoadTest.php
+++ b/tests/Dom/LoadTest.php
@@ -12,83 +12,83 @@ class LoadTest extends TestCase
      */
     private $dom;
 
-    public function setUp()
+    public function setUp(): void
     {
         $dom = new Dom();
         $dom->loadStr('<div class="all"><br><p>Hey bro, <a href="google.com" id="78" data-quote="\"">click here</a></br></div><br class="both" />');
         $this->dom = $dom;
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
     }
 
-    public function testLoadEscapeQuotes()
+    public function testLoadEscapeQuotes(): void
     {
         $a = $this->dom->find('a', 0);
         $this->assertEquals('<a href="google.com" id="78" data-quote="\"">click here</a>', $a->outerHtml);
     }
 
-    public function testLoadNoClosingTag()
+    public function testLoadNoClosingTag(): void
     {
         $p = $this->dom->find('p', 0);
         $this->assertEquals('Hey bro, <a href="google.com" id="78" data-quote="\"">click here</a>', $p->innerHtml);
     }
 
-    public function testLoadClosingTagOnSelfClosing()
+    public function testLoadClosingTagOnSelfClosing(): void
     {
         $this->assertCount(2, $this->dom->find('br'));
     }
 
-    public function testIncorrectAccess()
+    public function testIncorrectAccess(): void
     {
         $div = $this->dom->find('div', 0);
         $this->assertEquals(null, $div->foo);
     }
 
-    public function testLoadAttributeOnSelfClosing()
+    public function testLoadAttributeOnSelfClosing(): void
     {
         $br = $this->dom->find('br', 1);
         $this->assertEquals('both', $br->getAttribute('class'));
     }
 
-    public function testToStringMagic()
+    public function testToStringMagic(): void
     {
         $this->assertEquals('<div class="all"><br /><p>Hey bro, <a href="google.com" id="78" data-quote="\"">click here</a></p></div><br class="both" />', (string) $this->dom);
     }
 
-    public function testGetMagic()
+    public function testGetMagic(): void
     {
         $this->assertEquals('<div class="all"><br /><p>Hey bro, <a href="google.com" id="78" data-quote="\"">click here</a></p></div><br class="both" />', $this->dom->innerHtml);
     }
 
-    public function testFirstChild()
+    public function testFirstChild(): void
     {
         $this->assertEquals('<div class="all"><br /><p>Hey bro, <a href="google.com" id="78" data-quote="\"">click here</a></p></div>', $this->dom->firstChild()->outerHtml);
     }
 
-    public function testLastChild()
+    public function testLastChild(): void
     {
         $this->assertEquals('<br class="both" />', $this->dom->lastChild()->outerHtml);
     }
 
-    public function testGetElementById()
+    public function testGetElementById(): void
     {
         $this->assertEquals('<a href="google.com" id="78" data-quote="\"">click here</a>', $this->dom->getElementById('78')->outerHtml);
     }
 
-    public function testGetElementsByTag()
+    public function testGetElementsByTag(): void
     {
         $this->assertEquals('<p>Hey bro, <a href="google.com" id="78" data-quote="\"">click here</a></p>', $this->dom->getElementsByTag('p')[0]->outerHtml);
     }
 
-    public function testGetElementsByClass()
+    public function testGetElementsByClass(): void
     {
         $this->assertEquals('<br /><p>Hey bro, <a href="google.com" id="78" data-quote="\"">click here</a></p>', $this->dom->getElementsByClass('all')[0]->innerHtml);
     }
 
-    public function testDeleteNode()
+    public function testDeleteNode(): void
     {
         $a = $this->dom->find('a')[0];
         $a->delete();
diff --git a/tests/Dom/NotLoadedTest.php b/tests/Dom/NotLoadedTest.php
index 7c1f0674..01d931f4 100644
--- a/tests/Dom/NotLoadedTest.php
+++ b/tests/Dom/NotLoadedTest.php
@@ -13,18 +13,18 @@ class NotLoadedTest extends TestCase
      */
     private $dom;
 
-    public function setUp()
+    public function setUp(): void
     {
         $dom = new Dom();
         $this->dom = $dom;
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
     }
 
-    public function testNotLoaded()
+    public function testNotLoaded(): void
     {
         $this->expectException(NotLoadedException::class);
         $div = $this->dom->find('div', 0);
diff --git a/tests/DomTest.php b/tests/DomTest.php
index 519d5594..260b751d 100755
--- a/tests/DomTest.php
+++ b/tests/DomTest.php
@@ -8,7 +8,7 @@
 
 class DomTest extends TestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
     }
@@ -16,7 +16,7 @@ public function tearDown()
     /**
      * <![CDATA[ should not be modified when cleanupInput is set to false.
      */
-    public function testParsingCData()
+    public function testParsingCData(): void
     {
         $html = "<script type=\"text/javascript\">/* <![CDATA[ */var et_core_api_spam_recaptcha = '';/* ]]> */</script>";
         $dom = new Dom();
@@ -25,7 +25,7 @@ public function testParsingCData()
         $this->assertSame($html, $dom->root->outerHtml());
     }
 
-    public function testLoadSelfclosingAttr()
+    public function testLoadSelfclosingAttr(): void
     {
         $dom = new Dom();
         $dom->loadStr("<div class='all'><br  foo  bar  />baz</div>");
@@ -33,7 +33,7 @@ public function testLoadSelfclosingAttr()
         $this->assertEquals('<br foo bar />', $br->outerHtml);
     }
 
-    public function testLoadSelfclosingAttrToString()
+    public function testLoadSelfclosingAttrToString(): void
     {
         $dom = new Dom();
         $dom->loadStr("<div class='all'><br  foo  bar  />baz</div>");
@@ -41,77 +41,77 @@ public function testLoadSelfclosingAttrToString()
         $this->assertEquals('<br foo bar />', (string) $br);
     }
 
-    public function testLoadNoOpeningTag()
+    public function testLoadNoOpeningTag(): void
     {
         $dom = new Dom();
         $dom->loadStr('<div class="all"><font color="red"><strong>PR Manager</strong></font></b><div class="content">content</div></div>');
         $this->assertEquals('content', $dom->find('.content', 0)->text);
     }
 
-    public function testLoadNoValueAttribute()
+    public function testLoadNoValueAttribute(): void
     {
         $dom = new Dom();
         $dom->loadStr('<div class="content"><div class="grid-container" ui-view>Main content here</div></div>');
         $this->assertEquals('<div class="content"><div class="grid-container" ui-view>Main content here</div></div>', $dom->innerHtml);
     }
 
-    public function testLoadBackslashAttributeValue()
+    public function testLoadBackslashAttributeValue(): void
     {
         $dom = new Dom();
         $dom->loadStr('<div class="content"><div id="\" class="grid-container" ui-view>Main content here</div></div>');
         $this->assertEquals('<div class="content"><div id="\" class="grid-container" ui-view>Main content here</div></div>', $dom->innerHtml);
     }
 
-    public function testLoadNoValueAttributeBefore()
+    public function testLoadNoValueAttributeBefore(): void
     {
         $dom = new Dom();
         $dom->loadStr('<div class="content"><div ui-view class="grid-container">Main content here</div></div>');
         $this->assertEquals('<div class="content"><div ui-view class="grid-container">Main content here</div></div>', $dom->innerHtml);
     }
 
-    public function testLoadUpperCase()
+    public function testLoadUpperCase(): void
     {
         $dom = new Dom();
         $dom->loadStr('<DIV CLASS="ALL"><BR><P>hEY BRO, <A HREF="GOOGLE.COM" DATA-QUOTE="\"">CLICK HERE</A></BR></DIV>');
         $this->assertEquals('<br /><p>hEY BRO, <a href="GOOGLE.COM" data-quote="\"">CLICK HERE</a></p>', $dom->find('div', 0)->innerHtml);
     }
 
-    public function testLoadWithFile()
+    public function testLoadWithFile(): void
     {
         $dom = new Dom();
         $dom->loadFromFile('tests/data/files/small.html');
         $this->assertEquals('VonBurgermeister', $dom->find('.post-user font', 0)->text);
     }
 
-    public function testLoadFromFile()
+    public function testLoadFromFile(): void
     {
         $dom = new Dom();
         $dom->loadFromFile('tests/data/files/small.html');
         $this->assertEquals('VonBurgermeister', $dom->find('.post-user font', 0)->text);
     }
 
-    public function testLoadFromFileFind()
+    public function testLoadFromFileFind(): void
     {
         $dom = new Dom();
         $dom->loadFromFile('tests/data/files/small.html');
         $this->assertEquals('VonBurgermeister', $dom->find('.post-row div .post-user font', 0)->text);
     }
 
-    public function testLoadFromFileNotFound()
+    public function testLoadFromFileNotFound(): void
     {
         $dom = new Dom();
         $this->expectException(\PHPHtmlParser\Exceptions\LogicalException::class);
         $dom->loadFromFile('tests/data/files/unkowne.html');
     }
 
-    public function testLoadUtf8()
+    public function testLoadUtf8(): void
     {
         $dom = new Dom();
         $dom->loadStr('<p>Dzień</p>');
         $this->assertEquals('Dzień', $dom->find('p', 0)->text);
     }
 
-    public function testLoadFileWhitespace()
+    public function testLoadFileWhitespace(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setCleanupInput(false));
@@ -120,14 +120,14 @@ public function testLoadFileWhitespace()
         $this->assertEquals('<span><span class="class"></span></span>', (string) $dom);
     }
 
-    public function testLoadFileBig()
+    public function testLoadFileBig(): void
     {
         $dom = new Dom();
         $dom->loadFromFile('tests/data/files/big.html');
         $this->assertEquals(20, \count($dom->find('.content-border')));
     }
 
-    public function testLoadFileBigTwice()
+    public function testLoadFileBigTwice(): void
     {
         $dom = new Dom();
         $dom->loadFromFile('tests/data/files/big.html');
@@ -135,7 +135,7 @@ public function testLoadFileBigTwice()
         $this->assertEquals(' <p>Журчанье воды<br /> Черно-белые тени<br /> Вновь на фонтане</p> ', $post->find('.post-message', 0)->innerHtml);
     }
 
-    public function testLoadFileBigTwicePreserveOption()
+    public function testLoadFileBigTwicePreserveOption(): void
     {
         $dom = new Dom();
         $dom->loadFromFile('tests/data/files/big.html',
@@ -147,7 +147,7 @@ public function testLoadFileBigTwicePreserveOption()
         );
     }
 
-    public function testLoadFromUrl()
+    public function testLoadFromUrl(): void
     {
         $streamMock = Mockery::mock(\Psr\Http\Message\StreamInterface::class);
         $streamMock->shouldReceive('getContents')
@@ -167,77 +167,77 @@ public function testLoadFromUrl()
         $this->assertEquals('VonBurgermeister', $dom->find('.post-row div .post-user font', 0)->text);
     }
 
-    public function testScriptCleanerScriptTag()
+    public function testScriptCleanerScriptTag(): void
     {
         $dom = new Dom();
         $dom->loadStr('
         <p>.....</p>
         <script>
-        Some code ... 
-        document.write("<script src=\'some script\'><\/script>") 
-        Some code ... 
+        Some code ...
+        document.write("<script src=\'some script\'><\/script>")
+        Some code ...
         </script>
         <p>....</p>');
         $this->assertEquals('....', $dom->getElementsByTag('p')[1]->innerHtml);
     }
 
-    public function testClosingSpan()
+    public function testClosingSpan(): void
     {
         $dom = new Dom();
         $dom->loadStr("<div class='foo'></span>sometext</div>");
         $this->assertEquals('sometext', $dom->getElementsByTag('div')[0]->innerHtml);
     }
 
-    public function testMultipleDoubleQuotes()
+    public function testMultipleDoubleQuotes(): void
     {
         $dom = new Dom();
         $dom->loadStr('<a title="This is a "test" of double quotes" href="http://www.example.com">Hello</a>');
         $this->assertEquals('This is a "test" of double quotes', $dom->getElementsByTag('a')[0]->title);
     }
 
-    public function testMultipleSingleQuotes()
+    public function testMultipleSingleQuotes(): void
     {
         $dom = new Dom();
         $dom->loadStr("<a title='Ain't this the best' href=\"http://www.example.com\">Hello</a>");
         $this->assertEquals("Ain't this the best", $dom->getElementsByTag('a')[0]->title);
     }
 
-    public function testBeforeClosingTag()
+    public function testBeforeClosingTag(): void
     {
         $dom = new Dom();
         $dom->loadStr('<div class="stream-container "  > <div class="stream-item js-new-items-bar-container"> </div> <div class="stream">');
         $this->assertEquals('<div class="stream-container "> <div class="stream-item js-new-items-bar-container"> </div> <div class="stream"></div></div>', (string) $dom);
     }
 
-    public function testCodeTag()
+    public function testCodeTag(): void
     {
         $dom = new Dom();
         $dom->loadStr('<strong>hello</strong><code class="language-php">$foo = "bar";</code>');
         $this->assertEquals('<strong>hello</strong><code class="language-php">$foo = "bar";</code>', (string) $dom);
     }
 
-    public function testCountChildren()
+    public function testCountChildren(): void
     {
         $dom = new Dom();
         $dom->loadStr('<strong>hello</strong><code class="language-php">$foo = "bar";</code>');
         $this->assertEquals(2, $dom->countChildren());
     }
 
-    public function testGetChildrenArray()
+    public function testGetChildrenArray(): void
     {
         $dom = new Dom();
         $dom->loadStr('<strong>hello</strong><code class="language-php">$foo = "bar";</code>');
-        $this->assertInternalType('array', $dom->getChildren());
+        $this->assertIsArray($dom->getChildren());
     }
 
-    public function testHasChildren()
+    public function testHasChildren(): void
     {
         $dom = new Dom();
         $dom->loadStr('<strong>hello</strong><code class="language-php">$foo = "bar";</code>');
         $this->assertTrue($dom->hasChildren());
     }
 
-    public function testWhitespaceInText()
+    public function testWhitespaceInText(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setRemoveDoubleSpace(false));
@@ -245,7 +245,7 @@ public function testWhitespaceInText()
         $this->assertEquals('<pre>    Hello world</pre>', (string) $dom);
     }
 
-    public function testGetComplexAttribute()
+    public function testGetComplexAttribute(): void
     {
         $dom = new Dom();
         $dom->loadStr('<a href="?search=Fort+William&session_type=face&distance=100&uqs=119846&page=4" class="pagination-next">Next <span class="chevron">&gt;</span></a>');
@@ -253,7 +253,7 @@ public function testGetComplexAttribute()
         $this->assertEquals('?search=Fort+William&session_type=face&distance=100&uqs=119846&page=4', $href);
     }
 
-    public function testGetComplexAttributeHtmlSpecialCharsDecode()
+    public function testGetComplexAttributeHtmlSpecialCharsDecode(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setHtmlSpecialCharsDecode(true));
@@ -264,7 +264,7 @@ public function testGetComplexAttributeHtmlSpecialCharsDecode()
         $this->assertEquals('?search=Fort+William&session_type=face&distance=100&uqs=119846&page=4', $href);
     }
 
-    public function testGetChildrenNoChildren()
+    public function testGetChildrenNoChildren(): void
     {
         $dom = new Dom();
         $dom->loadStr('<div>Test <img src="test.jpg"></div>');
@@ -274,7 +274,7 @@ public function testGetChildrenNoChildren()
         $this->assertTrue(\count($children) === 0);
     }
 
-    public function testInfiniteLoopNotHappening()
+    public function testInfiniteLoopNotHappening(): void
     {
         $dom = new Dom();
         $dom->loadStr('<html>
@@ -290,7 +290,7 @@ public function testInfiniteLoopNotHappening()
         $this->assertEquals(4, \count($metaNodes));
     }
 
-    public function testFindOrder()
+    public function testFindOrder(): void
     {
         $str = '<p><img src="http://example.com/first.jpg"></p><img src="http://example.com/second.jpg">';
         $dom = new Dom();
@@ -300,7 +300,7 @@ public function testFindOrder()
         $this->assertEquals('<img src="http://example.com/first.jpg" />', (string) $images[0]);
     }
 
-    public function testCaseInSensitivity()
+    public function testCaseInSensitivity(): void
     {
         $str = "<FooBar Attribute='asdf'>blah</FooBar>";
         $dom = new Dom();
@@ -310,7 +310,7 @@ public function testCaseInSensitivity()
         $this->assertEquals('asdf', $FooBar->getAttribute('attribute'));
     }
 
-    public function testCaseSensitivity()
+    public function testCaseSensitivity(): void
     {
         $str = "<FooBar Attribute='asdf'>blah</FooBar>";
         $dom = new Dom();
@@ -320,7 +320,7 @@ public function testCaseSensitivity()
         $this->assertEquals('asdf', $FooBar->Attribute);
     }
 
-    public function testEmptyAttribute()
+    public function testEmptyAttribute(): void
     {
         $str = '<ul class="summary"><li class></li>blah<li class="foo">what</li></ul>';
         $dom = new Dom();
@@ -330,7 +330,7 @@ public function testEmptyAttribute()
         $this->assertEquals(1, \count($items));
     }
 
-    public function testInnerText()
+    public function testInnerText(): void
     {
         $html = <<<EOF
 <body class="" style="" data-gr-c-s-loaded="true">123<a>456789</a><span>101112</span></body>
@@ -340,7 +340,7 @@ public function testInnerText()
         $this->assertEquals($dom->innerText, '123456789101112');
     }
 
-    public function testMultipleSquareSelector()
+    public function testMultipleSquareSelector(): void
     {
         $dom = new Dom();
         $dom->loadStr('<input name="foo" type="text" baz="fig">');
@@ -349,7 +349,7 @@ public function testMultipleSquareSelector()
         $this->assertEquals(1, \count($items));
     }
 
-    public function testNotSquareSelector()
+    public function testNotSquareSelector(): void
     {
         $dom = new Dom();
         $dom->loadStr('<input name="foo" type="text" baz="fig">');
@@ -358,7 +358,7 @@ public function testNotSquareSelector()
         $this->assertEquals(1, \count($items));
     }
 
-    public function testStartSquareSelector()
+    public function testStartSquareSelector(): void
     {
         $dom = new Dom();
         $dom->loadStr('<input name="foo" type="text" baz="fig">');
@@ -367,7 +367,7 @@ public function testStartSquareSelector()
         $this->assertEquals(1, \count($items));
     }
 
-    public function testEndSquareSelector()
+    public function testEndSquareSelector(): void
     {
         $dom = new Dom();
         $dom->loadStr('<input name="foo" type="text" baz="fig">');
@@ -376,7 +376,7 @@ public function testEndSquareSelector()
         $this->assertEquals(1, \count($items));
     }
 
-    public function testStarSquareSelector()
+    public function testStarSquareSelector(): void
     {
         $dom = new Dom();
         $dom->loadStr('<input name="foo" type="text" baz="fig">');
@@ -385,7 +385,7 @@ public function testStarSquareSelector()
         $this->assertEquals(1, \count($items));
     }
 
-    public function testStarFullRegexSquareSelector()
+    public function testStarFullRegexSquareSelector(): void
     {
         $dom = new Dom();
         $dom->loadStr('<input name="foo" type="text" baz="fig">');
@@ -394,7 +394,7 @@ public function testStarFullRegexSquareSelector()
         $this->assertEquals(1, \count($items));
     }
 
-    public function testFailedSquareSelector()
+    public function testFailedSquareSelector(): void
     {
         $dom = new Dom();
         $dom->loadStr('<input name="foo" type="text" baz="fig">');
@@ -403,7 +403,7 @@ public function testFailedSquareSelector()
         $this->assertEquals(1, \count($items));
     }
 
-    public function testLoadGetAttributeWithBackslash()
+    public function testLoadGetAttributeWithBackslash(): void
     {
         $dom = new Dom();
         $dom->loadStr('<div><a href="/test/"><img alt="\" src="/img/test.png" /><br /></a><a href="/demo/"><img alt="demo" src="/img/demo.png" /></a></div>');
@@ -411,7 +411,7 @@ public function testLoadGetAttributeWithBackslash()
         $this->assertEquals('/img/test.png', $imgs->getAttribute('src'));
     }
 
-    public function test25ChildrenFound()
+    public function test25ChildrenFound(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setWhitespaceTextNode(false));
@@ -420,7 +420,7 @@ public function test25ChildrenFound()
         $this->assertEquals(25, \count($children));
     }
 
-    public function testHtml5PageloadStr()
+    public function testHtml5PageloadStr(): void
     {
         $dom = new Dom();
         $dom->loadFromFile('tests/data/files/html5.html');
@@ -430,7 +430,7 @@ public function testHtml5PageloadStr()
         $this->assertEquals('max-width: 29px', $div->getAttribute('style'));
     }
 
-    public function testFindAttributeInBothParentAndChild()
+    public function testFindAttributeInBothParentAndChild(): void
     {
         $dom = new Dom();
         $dom->loadStr('<parent attribute="something">
@@ -442,7 +442,7 @@ public function testFindAttributeInBothParentAndChild()
         $this->assertCount(2, $nodes);
     }
 
-    public function testLessThanCharacterInJavascript()
+    public function testLessThanCharacterInJavascript(): void
     {
         $results = (new Dom())->loadStr('<html><head><script type="text/javascript">
             console.log(1 < 3);
@@ -453,7 +453,7 @@ public function testLessThanCharacterInJavascript()
         $this->assertCount(1, $results);
     }
 
-    public function testUniqueIdForAllObjects()
+    public function testUniqueIdForAllObjects(): void
     {
         // Create a dom which will be used as a parent/container for a paragraph
         $dom1 = new \PHPHtmlParser\Dom();
@@ -470,7 +470,7 @@ public function testUniqueIdForAllObjects()
         $this->assertEquals('A container div<p>Our new paragraph.</p>', $div->innerhtml);
     }
 
-    public function testFindDescendantsOfMatch()
+    public function testFindDescendantsOfMatch(): void
     {
         $dom = new Dom();
         $dom->loadStr('<p>
@@ -488,7 +488,7 @@ public function testFindDescendantsOfMatch()
         $this->assertCount(5, $nodes);
     }
 
-    public function testCompatibleWithWordPressShortcode()
+    public function testCompatibleWithWordPressShortcode(): void
     {
         $dom = new Dom();
         $dom->loadStr('<p>
@@ -499,7 +499,7 @@ public function testCompatibleWithWordPressShortcode()
         $this->assertEquals(' [wprs_alert type="success" content="this is a short code" /] ', $node->innerHtml);
     }
 
-    public function testBrokenHtml()
+    public function testBrokenHtml(): void
     {
         $dom = new Dom();
         $dom->loadStr('<the thing broke itV');
@@ -507,7 +507,7 @@ public function testBrokenHtml()
         $this->assertEquals('<the thing broke itv></the>', $dom->outerHtml);
     }
 
-    public function testXMLOpeningToken()
+    public function testXMLOpeningToken(): void
     {
         $dom = new Dom();
         $dom->loadStr('<?xml version="1.0" encoding="UTF-8"?><p>fun time</p>');
@@ -518,7 +518,7 @@ public function testXMLOpeningToken()
     /**
      * Test to cover issue found in ticket #221.
      */
-    public function testRandomTagInMiddleOfText()
+    public function testRandomTagInMiddleOfText(): void
     {
         $dom = new Dom();
         $dom->loadStr('<p>Hello, this is just a test in which <55 names with some other text > should be interpreted as text</p>');
@@ -526,7 +526,7 @@ public function testRandomTagInMiddleOfText()
         $this->assertEquals('<p>Hello, this is just a test in which <55 names with some other text> should be interpreted as text</55></p>', $dom->outerHtml);
     }
 
-    public function testHttpCall()
+    public function testHttpCall(): void
     {
         $dom = new Dom();
         $dom->loadFromUrl('http://google.com');
diff --git a/tests/Node/ChildrenTest.php b/tests/Node/ChildrenTest.php
index 37a160ff..37b4a1cf 100755
--- a/tests/Node/ChildrenTest.php
+++ b/tests/Node/ChildrenTest.php
@@ -8,7 +8,7 @@
 
 class NodeChildTest extends TestCase
 {
-    public function testGetParent()
+    public function testGetParent(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -16,7 +16,7 @@ public function testGetParent()
         $this->assertEquals($parent->id(), $child->getParent()->id());
     }
 
-    public function testSetParentTwice()
+    public function testSetParentTwice(): void
     {
         $parent = new Node();
         $parent2 = new Node();
@@ -26,7 +26,7 @@ public function testSetParentTwice()
         $this->assertEquals($parent2->id(), $child->getParent()->id());
     }
 
-    public function testNextSibling()
+    public function testNextSibling(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -36,27 +36,23 @@ public function testNextSibling()
         $this->assertEquals($child2->id(), $child->nextSibling()->id());
     }
 
-    /**
-     * @expectedException \PHPHtmlParser\Exceptions\ChildNotFoundException
-     */
-    public function testNextSiblingNotFound()
+    public function testNextSiblingNotFound(): void
     {
         $parent = new Node();
         $child = new Node();
         $child->setParent($parent);
+        $this->expectException(\PHPHtmlParser\Exceptions\ChildNotFoundException::class);
         $child->nextSibling();
     }
 
-    /**
-     * @expectedException \PHPHtmlParser\Exceptions\ParentNotFoundException
-     */
-    public function testNextSiblingNoParent()
+    public function testNextSiblingNoParent(): void
     {
         $child = new Node();
+        $this->expectException(\PHPHtmlParser\Exceptions\ParentNotFoundException::class);
         $child->nextSibling();
     }
 
-    public function testPreviousSibling()
+    public function testPreviousSibling(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -66,27 +62,23 @@ public function testPreviousSibling()
         $this->assertEquals($child->id(), $child2->previousSibling()->id());
     }
 
-    /**
-     * @expectedException \PHPHtmlParser\Exceptions\ChildNotFoundException
-     */
-    public function testPreviousSiblingNotFound()
+    public function testPreviousSiblingNotFound(): void
     {
         $parent = new Node();
         $node = new Node();
         $node->setParent($parent);
+        $this->expectException(\PHPHtmlParser\Exceptions\ChildNotFoundException::class);
         $node->previousSibling();
     }
 
-    /**
-     * @expectedException \PHPHtmlParser\Exceptions\ParentNotFoundException
-     */
-    public function testPreviousSiblingNoParent()
+    public function testPreviousSiblingNoParent(): void
     {
         $child = new Node();
+        $this->expectException(\PHPHtmlParser\Exceptions\ParentNotFoundException::class);
         $child->previousSibling();
     }
 
-    public function testGetChildren()
+    public function testGetChildren(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -96,7 +88,7 @@ public function testGetChildren()
         $this->assertEquals($child->id(), $parent->getChildren()[0]->id());
     }
 
-    public function testCountChildren()
+    public function testCountChildren(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -106,7 +98,7 @@ public function testCountChildren()
         $this->assertEquals(2, $parent->countChildren());
     }
 
-    public function testIsChild()
+    public function testIsChild(): void
     {
         $parent = new Node();
         $child1 = new Node();
diff --git a/tests/Node/HtmlTest.php b/tests/Node/HtmlTest.php
index 592003b4..90ac0148 100755
--- a/tests/Node/HtmlTest.php
+++ b/tests/Node/HtmlTest.php
@@ -12,7 +12,7 @@
 
 class NodeHtmlTest extends TestCase
 {
-    public function testInnerHtml()
+    public function testInnerHtml(): void
     {
         $div = new Tag('div');
         $div->setAttributes([
@@ -41,7 +41,7 @@ public function testInnerHtml()
         $this->assertEquals("<a href='http://google.com'>link</a><br />", $parent->innerHtml());
     }
 
-    public function testInnerHtmlTwice()
+    public function testInnerHtmlTwice(): void
     {
         $div = new Tag('div');
         $div->setAttributes([
@@ -66,10 +66,7 @@ public function testInnerHtmlTwice()
         $this->assertEquals($inner, $parent->innerHtml());
     }
 
-    /**
-     * @expectedException \PHPHtmlParser\Exceptions\UnknownChildTypeException
-     */
-    public function testInnerHtmlUnkownChild()
+    public function testInnerHtmlUnkownChild(): void
     {
         $div = new Tag('div');
         $div->setAttributes([
@@ -95,11 +92,11 @@ public function testInnerHtmlUnkownChild()
         $parent->addChild($childbr);
         $childa->addChild(new TextNode('link'));
 
-        $inner = $parent->innerHtml();
-        $this->assertEquals($inner, $parent->innerHtml());
+        $this->expectException(\PHPHtmlParser\Exceptions\UnknownChildTypeException::class);
+        $parent->innerHtml();
     }
 
-    public function testInnerHtmlMagic()
+    public function testInnerHtmlMagic(): void
     {
         $parent = new HtmlNode('div');
         $parent->tag->setAttributes([
@@ -125,7 +122,7 @@ public function testInnerHtmlMagic()
         $this->assertEquals("<a href='http://google.com'>link</a><br />", $parent->innerHtml);
     }
 
-    public function testOuterHtml()
+    public function testOuterHtml(): void
     {
         $div = new Tag('div');
         $div->setAttributes([
@@ -154,7 +151,7 @@ public function testOuterHtml()
         $this->assertEquals('<div class="all"><a href=\'http://google.com\'>link</a><br /></div>', $parent->outerHtml());
     }
 
-    public function testOuterHtmlTwice()
+    public function testOuterHtmlTwice(): void
     {
         $div = new Tag('div');
         $div->setAttributes([
@@ -184,7 +181,7 @@ public function testOuterHtmlTwice()
         $this->assertEquals($outer, $parent->outerHtml());
     }
 
-    public function testOuterHtmlEmpty()
+    public function testOuterHtmlEmpty(): void
     {
         $a = new Tag('a');
         $a->setAttributes([
@@ -198,7 +195,7 @@ public function testOuterHtmlEmpty()
         $this->assertEquals("<a href='http://google.com'></a>", $node->OuterHtml());
     }
 
-    public function testOuterHtmlMagic()
+    public function testOuterHtmlMagic(): void
     {
         $parent = new HtmlNode('div');
         $parent->getTag()->setAttributes([
@@ -224,7 +221,7 @@ public function testOuterHtmlMagic()
         $this->assertEquals('<div class="all"><a href=\'http://google.com\'>link</a><br /></div>', $parent->outerHtml);
     }
 
-    public function testOuterHtmlNoValueAttribute()
+    public function testOuterHtmlNoValueAttribute(): void
     {
         $parent = new HtmlNode('div');
         $parent->setAttribute('class', 'all');
@@ -241,7 +238,7 @@ public function testOuterHtmlNoValueAttribute()
         $this->assertEquals('<div class="all"><a href=\'http://google.com\' ui-view>link</a><br /></div>', $parent->outerHtml);
     }
 
-    public function testOuterHtmlWithChanges()
+    public function testOuterHtmlWithChanges(): void
     {
         $div = new Tag('div');
         $div->setAttributes([
@@ -274,7 +271,7 @@ public function testOuterHtmlWithChanges()
         $this->assertEquals('<a href="https://www.google.com">link</a>', $childa->outerHtml());
     }
 
-    public function testText()
+    public function testText(): void
     {
         $a = new Tag('a');
         $node = new HtmlNode($a);
@@ -283,7 +280,7 @@ public function testText()
         $this->assertEquals('link', $node->text());
     }
 
-    public function testTextTwice()
+    public function testTextTwice(): void
     {
         $a = new Tag('a');
         $node = new HtmlNode($a);
@@ -293,7 +290,7 @@ public function testTextTwice()
         $this->assertEquals($text, $node->text());
     }
 
-    public function testTextNone()
+    public function testTextNone(): void
     {
         $a = new Tag('a');
         $node = new HtmlNode($a);
@@ -301,7 +298,7 @@ public function testTextNone()
         $this->assertEmpty($node->text());
     }
 
-    public function testTextMagic()
+    public function testTextMagic(): void
     {
         $node = new HtmlNode('a');
         $node->addChild(new TextNode('link'));
@@ -309,7 +306,7 @@ public function testTextMagic()
         $this->assertEquals('link', $node->text);
     }
 
-    public function testTextLookInChildren()
+    public function testTextLookInChildren(): void
     {
         $p = new HtmlNode('p');
         $a = new HtmlNode('a');
@@ -323,7 +320,7 @@ public function testTextLookInChildren()
         $this->assertEquals('Please click me!', $node->text(true));
     }
 
-    public function testInnerText()
+    public function testInnerText(): void
     {
         $node = new HtmlNode('div');
         $node->addChild(new TextNode('123 '));
@@ -337,7 +334,7 @@ public function testInnerText()
         $this->assertEquals($node->innerText, '123 456789 101112');
     }
 
-    public function testTextLookInChildrenAndNoChildren()
+    public function testTextLookInChildrenAndNoChildren(): void
     {
         $p = new HtmlNode('p');
         $a = new HtmlNode('a');
@@ -352,7 +349,7 @@ public function testTextLookInChildrenAndNoChildren()
         $this->assertEquals('Please click me!', $p->text(true));
     }
 
-    public function testGetAttribute()
+    public function testGetAttribute(): void
     {
         $node = new HtmlNode('a');
         $node->getTag()->setAttributes([
@@ -369,7 +366,7 @@ public function testGetAttribute()
         $this->assertEquals('outerlink rounded', $node->getAttribute('class'));
     }
 
-    public function testGetAttributeMagic()
+    public function testGetAttributeMagic(): void
     {
         $node = new HtmlNode('a');
         $node->getTag()->setAttributes([
@@ -386,7 +383,7 @@ public function testGetAttributeMagic()
         $this->assertEquals('http://google.com', $node->href);
     }
 
-    public function testGetAttributes()
+    public function testGetAttributes(): void
     {
         $node = new HtmlNode('a');
         $node->getTag()->setAttributes([
@@ -403,14 +400,14 @@ public function testGetAttributes()
         $this->assertEquals('outerlink rounded', $node->getAttributes()['class']);
     }
 
-    public function testSetAttribute()
+    public function testSetAttribute(): void
     {
         $node = new HtmlNode('a');
         $node->setAttribute('class', 'foo');
         $this->assertEquals('foo', $node->getAttribute('class'));
     }
 
-    public function testRemoveAttribute()
+    public function testRemoveAttribute(): void
     {
         $node = new HtmlNode('a');
         $node->setAttribute('class', 'foo');
@@ -418,7 +415,7 @@ public function testRemoveAttribute()
         $this->assertnull($node->getAttribute('class'));
     }
 
-    public function testRemoveAllAttributes()
+    public function testRemoveAllAttributes(): void
     {
         $node = new HtmlNode('a');
         $node->setAttribute('class', 'foo');
@@ -427,7 +424,7 @@ public function testRemoveAllAttributes()
         $this->assertEquals(0, \count($node->getAttributes()));
     }
 
-    public function testSetTag()
+    public function testSetTag(): void
     {
         $node = new HtmlNode('div');
         $this->assertEquals('<div></div>', $node->outerHtml());
@@ -439,7 +436,7 @@ public function testSetTag()
         $this->assertEquals('<span></span>', $node->outerHtml());
     }
 
-    public function testCountable()
+    public function testCountable(): void
     {
         $div = new Tag('div');
         $div->setAttributes([
@@ -468,7 +465,7 @@ public function testCountable()
         $this->assertEquals(\count($parent->getChildren()), \count($parent));
     }
 
-    public function testIterator()
+    public function testIterator(): void
     {
         $div = new Tag('div');
         $div->setAttributes([
@@ -501,17 +498,15 @@ public function testIterator()
         $this->assertEquals(2, $children);
     }
 
-    /**
-     * @expectedException \PHPHtmlParser\Exceptions\ParentNotFoundException
-     */
-    public function testAncestorByTagFailure()
+    public function testAncestorByTagFailure(): void
     {
         $a = new Tag('a');
         $node = new HtmlNode($a);
+        $this->expectException(\PHPHtmlParser\Exceptions\ParentNotFoundException::class);
         $node->ancestorByTag('div');
     }
 
-    public function testReplaceNode()
+    public function testReplaceNode(): void
     {
         $dom = new Dom();
         $dom->loadStr('<div class="all"><p>Hey bro, <a href="google.com">click here</a><br /> :)</p></div>');
@@ -521,7 +516,7 @@ public function testReplaceNode()
         $this->assertEquals('<div class="all"><h1></h1></div>', (string) $dom);
     }
 
-    public function testTextNodeFirstChild()
+    public function testTextNodeFirstChild(): void
     {
         $dom = new Dom();
         $dom->loadStr('<div class="all"><p>Hey bro, <a href="google.com">click here</a><br /> :)</p></div>');
diff --git a/tests/Node/ParentTest.php b/tests/Node/ParentTest.php
index 8a87aa32..89e4c6f0 100755
--- a/tests/Node/ParentTest.php
+++ b/tests/Node/ParentTest.php
@@ -8,7 +8,7 @@
 
 class NodeParentTest extends TestCase
 {
-    public function testHasChild()
+    public function testHasChild(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -16,20 +16,20 @@ public function testHasChild()
         $this->assertTrue($parent->hasChildren());
     }
 
-    public function testHasChildNoChildren()
+    public function testHasChildNoChildren(): void
     {
         $node = new Node();
         $this->assertFalse($node->hasChildren());
     }
 
-    public function testAddChild()
+    public function testAddChild(): void
     {
         $parent = new Node();
         $child = new Node();
         $this->assertTrue($parent->addChild($child));
     }
 
-    public function testAddChildTwoParent()
+    public function testAddChildTwoParent(): void
     {
         $parent = new Node();
         $parent2 = new Node();
@@ -39,7 +39,7 @@ public function testAddChildTwoParent()
         $this->assertFalse($parent->hasChildren());
     }
 
-    public function testGetChild()
+    public function testGetChild(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -49,7 +49,7 @@ public function testGetChild()
         $this->assertTrue($parent->getChild($child2->id()) instanceof Node);
     }
 
-    public function testRemoveChild()
+    public function testRemoveChild(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -58,14 +58,14 @@ public function testRemoveChild()
         $this->assertFalse($parent->hasChildren());
     }
 
-    public function testRemoveChildNotExists()
+    public function testRemoveChildNotExists(): void
     {
         $parent = new Node();
         $parent->removeChild(1);
         $this->assertFalse($parent->hasChildren());
     }
 
-    public function testNextChild()
+    public function testNextChild(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -76,7 +76,7 @@ public function testNextChild()
         $this->assertEquals($child2->id(), $parent->nextChild($child->id())->id());
     }
 
-    public function testHasNextChild()
+    public function testHasNextChild(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -87,7 +87,7 @@ public function testHasNextChild()
         $this->assertEquals($child2->id(), $parent->hasNextChild($child->id()));
     }
 
-    public function testHasNextChildNotExists()
+    public function testHasNextChildNotExists(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -96,7 +96,7 @@ public function testHasNextChildNotExists()
         $parent->hasNextChild($child->id());
     }
 
-    public function testNextChildWithRemove()
+    public function testNextChildWithRemove(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -110,7 +110,7 @@ public function testNextChildWithRemove()
         $this->assertEquals($child3->id(), $parent->nextChild($child->id())->id());
     }
 
-    public function testPreviousChild()
+    public function testPreviousChild(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -121,7 +121,7 @@ public function testPreviousChild()
         $this->assertEquals($child->id(), $parent->previousChild($child2->id())->id());
     }
 
-    public function testPreviousChildWithRemove()
+    public function testPreviousChildWithRemove(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -135,7 +135,7 @@ public function testPreviousChildWithRemove()
         $this->assertEquals($child->id(), $parent->previousChild($child3->id())->id());
     }
 
-    public function testFirstChild()
+    public function testFirstChild(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -148,7 +148,7 @@ public function testFirstChild()
         $this->assertEquals($child->id(), $parent->firstChild()->id());
     }
 
-    public function testLastChild()
+    public function testLastChild(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -161,7 +161,7 @@ public function testLastChild()
         $this->assertEquals($child3->id(), $parent->lastChild()->id());
     }
 
-    public function testInsertBeforeFirst()
+    public function testInsertBeforeFirst(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -179,7 +179,7 @@ public function testInsertBeforeFirst()
         $this->assertEquals($parent->lastChild()->id(), $child3->id());
     }
 
-    public function testInsertBeforeLast()
+    public function testInsertBeforeLast(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -197,7 +197,7 @@ public function testInsertBeforeLast()
         $this->assertEquals($parent->lastChild()->id(), $child3->id());
     }
 
-    public function testInsertAfterFirst()
+    public function testInsertAfterFirst(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -215,7 +215,7 @@ public function testInsertAfterFirst()
         $this->assertEquals($parent->lastChild()->id(), $child3->id());
     }
 
-    public function testInsertAfterLast()
+    public function testInsertAfterLast(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -233,7 +233,7 @@ public function testInsertAfterLast()
         $this->assertEquals($parent->lastChild()->id(), $child3->id());
     }
 
-    public function testReplaceChild()
+    public function testReplaceChild(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -246,38 +246,32 @@ public function testReplaceChild()
         $this->assertFalse($parent->isChild($child->id()));
     }
 
-    /**
-     * @expectedException \PHPHtmlParser\Exceptions\CircularException
-     */
-    public function testSetParentDescendantException()
+    public function testSetParentDescendantException(): void
     {
         $parent = new Node();
         $child = new Node();
         $parent->addChild($child);
+        $this->expectException(\PHPHtmlParser\Exceptions\CircularException::class);
         $parent->setParent($child);
     }
 
-    /**
-     * @expectedException \PHPHtmlParser\Exceptions\CircularException
-     */
-    public function testAddChildAncestorException()
+    public function testAddChildAncestorException(): void
     {
         $parent = new Node();
         $child = new Node();
         $parent->addChild($child);
+        $this->expectException(\PHPHtmlParser\Exceptions\CircularException::class);
         $child->addChild($parent);
     }
 
-    /**
-     * @expectedException \PHPHtmlParser\Exceptions\CircularException
-     */
-    public function testAddItselfAsChild()
+    public function testAddItselfAsChild(): void
     {
         $parent = new Node();
+        $this->expectException(\PHPHtmlParser\Exceptions\CircularException::class);
         $parent->addChild($parent);
     }
 
-    public function testIsAncestorParent()
+    public function testIsAncestorParent(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -285,7 +279,7 @@ public function testIsAncestorParent()
         $this->assertTrue($child->isAncestor($parent->id()));
     }
 
-    public function testGetAncestor()
+    public function testGetAncestor(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -294,7 +288,7 @@ public function testGetAncestor()
         $this->assertEquals($parent->id(), $ancestor->id());
     }
 
-    public function testGetGreatAncestor()
+    public function testGetGreatAncestor(): void
     {
         $parent = new Node();
         $child = new Node();
@@ -306,7 +300,7 @@ public function testGetGreatAncestor()
         $this->assertEquals($parent->id(), $ancestor->id());
     }
 
-    public function testGetAncestorNotFound()
+    public function testGetAncestorNotFound(): void
     {
         $parent = new Node();
         $ancestor = $parent->getAncestor(1);
diff --git a/tests/Node/TagTest.php b/tests/Node/TagTest.php
index f14de7e2..0f0b4144 100755
--- a/tests/Node/TagTest.php
+++ b/tests/Node/TagTest.php
@@ -7,14 +7,14 @@
 
 class NodeTagTest extends TestCase
 {
-    public function testSelfClosing()
+    public function testSelfClosing(): void
     {
         $tag = new Tag('a');
         $tag->selfClosing();
         $this->assertTrue($tag->isSelfClosing());
     }
 
-    public function testSetAttributes()
+    public function testSetAttributes(): void
     {
         $attr = [
             'href' => [
@@ -28,18 +28,16 @@ public function testSetAttributes()
         $this->assertEquals('http://google.com', $tag->getAttribute('href')->getValue());
     }
 
-    /**
-     * @expectedException \PHPHtmlParser\Exceptions\Tag\AttributeNotFoundException
-     */
-    public function testRemoveAttribute()
+    public function testRemoveAttribute(): void
     {
         $tag = new Tag('a');
         $tag->setAttribute('href', 'http://google.com');
         $tag->removeAttribute('href');
+        $this->expectException(\PHPHtmlParser\Exceptions\Tag\AttributeNotFoundException::class);
         $tag->getAttribute('href');
     }
 
-    public function testRemoveAllAttributes()
+    public function testRemoveAllAttributes(): void
     {
         $tag = new Tag('a');
         $tag->setAttribute('href', 'http://google.com');
@@ -48,14 +46,14 @@ public function testRemoveAllAttributes()
         $this->assertEquals(0, \count($tag->getAttributes()));
     }
 
-    public function testSetAttributeNoArray()
+    public function testSetAttributeNoArray(): void
     {
         $tag = new Tag('a');
         $tag->setAttribute('href', 'http://google.com');
         $this->assertEquals('http://google.com', $tag->getAttribute('href')->getValue());
     }
 
-    public function testSetAttributesNoDoubleArray()
+    public function testSetAttributesNoDoubleArray(): void
     {
         $attr = [
             'href'  => 'http://google.com',
@@ -67,7 +65,7 @@ public function testSetAttributesNoDoubleArray()
         $this->assertEquals('funtimes', $tag->getAttribute('class')->getValue());
     }
 
-    public function testUpdateAttributes()
+    public function testUpdateAttributes(): void
     {
         $tag = new Tag('a');
         $tag->setAttributes([
@@ -94,13 +92,13 @@ public function testUpdateAttributes()
         $this->assertEquals('https://www.google.com', $tag->getAttribute('href')->getValue());
     }
 
-    public function testNoise()
+    public function testNoise(): void
     {
         $tag = new Tag('a');
         $this->assertTrue($tag->noise('noise') instanceof Tag);
     }
 
-    public function testGetAttributeMagic()
+    public function testGetAttributeMagic(): void
     {
         $attr = [
             'href' => [
@@ -114,14 +112,14 @@ public function testGetAttributeMagic()
         $this->assertEquals('http://google.com', $tag->getAttribute('href')->getValue());
     }
 
-    public function testSetAttributeMagic()
+    public function testSetAttributeMagic(): void
     {
         $tag = new Tag('a');
         $tag->setAttribute('href', 'http://google.com');
         $this->assertEquals('http://google.com', $tag->getAttribute('href')->getValue());
     }
 
-    public function testMakeOpeningTag()
+    public function testMakeOpeningTag(): void
     {
         $attr = [
             'href' => [
@@ -135,7 +133,7 @@ public function testMakeOpeningTag()
         $this->assertEquals('<a href="http://google.com">', $tag->makeOpeningTag());
     }
 
-    public function testMakeOpeningTagEmptyAttr()
+    public function testMakeOpeningTagEmptyAttr(): void
     {
         $attr = [
             'href' => [
@@ -150,7 +148,7 @@ public function testMakeOpeningTagEmptyAttr()
         $this->assertEquals('<a href="http://google.com" selected>', $tag->makeOpeningTag());
     }
 
-    public function testMakeOpeningTagSelfClosing()
+    public function testMakeOpeningTagSelfClosing(): void
     {
         $attr = [
             'class' => [
@@ -165,30 +163,30 @@ public function testMakeOpeningTagSelfClosing()
         $this->assertEquals('<div class="clear-fix" />', $tag->makeOpeningTag());
     }
 
-    public function testMakeClosingTag()
+    public function testMakeClosingTag(): void
     {
         $tag = new Tag('a');
         $this->assertEquals('</a>', $tag->makeClosingTag());
     }
 
-    public function testMakeClosingTagSelfClosing()
+    public function testMakeClosingTagSelfClosing(): void
     {
         $tag = new Tag('div');
         $tag->selfClosing();
         $this->assertEmpty($tag->makeClosingTag());
     }
 
-    public function testSetTagAttribute()
+    public function testSetTagAttribute(): void
     {
         $tag = new Tag('div');
         $tag->setStyleAttributeValue('display', 'none');
         $this->assertEquals('display:none;', $tag->getAttribute('style')->getValue());
     }
 
-    public function testGetStyleAttributesArray()
+    public function testGetStyleAttributesArray(): void
     {
         $tag = new Tag('div');
         $tag->setStyleAttributeValue('display', 'none');
-        $this->assertInternalType('array', $tag->getStyleAttributeArray());
+        $this->assertIsArray($tag->getStyleAttributeArray());
     }
 }
diff --git a/tests/Node/TextTest.php b/tests/Node/TextTest.php
index f94c4962..dae77b48 100755
--- a/tests/Node/TextTest.php
+++ b/tests/Node/TextTest.php
@@ -10,52 +10,52 @@
 
 class NodeTextTest extends TestCase
 {
-    public function testText()
+    public function testText(): void
     {
         $node = new TextNode('foo bar');
         $this->assertEquals('foo bar', $node->text());
     }
 
-    public function testGetTag()
+    public function testGetTag(): void
     {
         $node = new TextNode('foo bar');
         $this->assertEquals('text', $node->getTag()->name());
     }
 
-    public function testAncestorByTag()
+    public function testAncestorByTag(): void
     {
         $node = new TextNode('foo bar');
         $text = $node->ancestorByTag('text');
         $this->assertEquals($node, $text);
     }
 
-    public function testPreserveEntity()
+    public function testPreserveEntity(): void
     {
         $node = new TextNode('&#x69;');
         $text = $node->outerhtml;
         $this->assertEquals('&#x69;', $text);
     }
 
-    public function testIsTextNode()
+    public function testIsTextNode(): void
     {
         $node = new TextNode('text');
         $this->assertEquals(true, $node->isTextNode());
     }
 
-    public function testTextInTextNode()
+    public function testTextInTextNode(): void
     {
         $node = new TextNode('foo bar');
         $this->assertEquals('foo bar', $node->outerHtml());
     }
 
-    public function testSetTextToTextNode()
+    public function testSetTextToTextNode(): void
     {
         $node = new TextNode('');
         $node->setText('foo bar');
         $this->assertEquals('foo bar', $node->innerHtml());
     }
 
-    public function testSetText()
+    public function testSetText(): void
     {
         $dom = new Dom();
         $dom->loadStr('<div class="all"><p>Hey bro, <a href="google.com">click here</a><br /> :)</p></div>');
@@ -64,7 +64,7 @@ public function testSetText()
         $this->assertEquals('<div class="all"><p>Hey bro, <a href="google.com">biz baz</a><br /> :)</p></div>', (string) $dom);
     }
 
-    public function testSetTextEncoded()
+    public function testSetTextEncoded(): void
     {
         $encode = new Encode();
         $encode->from('UTF-8');
diff --git a/tests/Options/CleanupTest.php b/tests/Options/CleanupTest.php
index 914078ac..576541a7 100755
--- a/tests/Options/CleanupTest.php
+++ b/tests/Options/CleanupTest.php
@@ -8,7 +8,7 @@
 
 class CleanupTest extends TestCase
 {
-    public function testCleanupInputTrue()
+    public function testCleanupInputTrue(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setCleanupInput(true));
@@ -17,7 +17,7 @@ public function testCleanupInputTrue()
         $this->assertEquals(0, \count($dom->find('script')));
     }
 
-    public function testCleanupInputFalse()
+    public function testCleanupInputFalse(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setCleanupInput(false));
@@ -26,7 +26,7 @@ public function testCleanupInputFalse()
         $this->assertEquals(22, \count($dom->find('script')));
     }
 
-    public function testRemoveStylesTrue()
+    public function testRemoveStylesTrue(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setRemoveStyles(true));
@@ -34,7 +34,7 @@ public function testRemoveStylesTrue()
         $this->assertEquals(0, \count($dom->find('style')));
     }
 
-    public function testRemoveStylesFalse()
+    public function testRemoveStylesFalse(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setRemoveStyles(false));
@@ -44,7 +44,7 @@ public function testRemoveStylesFalse()
             $dom->find('style')->getAttribute('type'));
     }
 
-    public function testRemoveScriptsTrue()
+    public function testRemoveScriptsTrue(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setRemoveScripts(true));
@@ -52,7 +52,7 @@ public function testRemoveScriptsTrue()
         $this->assertEquals(0, \count($dom->find('script')));
     }
 
-    public function testRemoveScriptsFalse()
+    public function testRemoveScriptsFalse(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setRemoveScripts(false));
@@ -62,7 +62,7 @@ public function testRemoveScriptsFalse()
             $dom->find('script')->getAttribute('type'));
     }
 
-    public function testSmartyScripts()
+    public function testSmartyScripts(): void
     {
         $dom = new Dom();
         $dom->loadStr('
@@ -71,7 +71,7 @@ public function testSmartyScripts()
         $this->assertEquals(' aa= ', $dom->innerHtml);
     }
 
-    public function testSmartyScriptsDisabled()
+    public function testSmartyScriptsDisabled(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setRemoveSmartyScripts(false));
diff --git a/tests/Options/NoSlashTest.php b/tests/Options/NoSlashTest.php
index 93370b56..fb5924d1 100644
--- a/tests/Options/NoSlashTest.php
+++ b/tests/Options/NoSlashTest.php
@@ -8,7 +8,7 @@
 
 class NoSlashTest extends TestCase
 {
-    public function testLoadClosingTagOnSelfClosingNoSlash()
+    public function testLoadClosingTagOnSelfClosingNoSlash(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->addNoSlashTag('br'));
@@ -17,7 +17,7 @@ public function testLoadClosingTagOnSelfClosingNoSlash()
         $this->assertEquals('<br><p>Hey bro, <a href="google.com" data-quote="\"">click here</a></p>', $dom->find('div', 0)->innerHtml);
     }
 
-    public function testLoadClosingTagOnSelfClosingRemoveNoSlash()
+    public function testLoadClosingTagOnSelfClosingRemoveNoSlash(): void
     {
         $dom = new Dom();
         $dom->setOptions(
@@ -30,7 +30,7 @@ public function testLoadClosingTagOnSelfClosingRemoveNoSlash()
         $this->assertEquals('<br /><p>Hey bro, <a href="google.com" data-quote="\"">click here</a></p>', $dom->find('div', 0)->innerHtml);
     }
 
-    public function testLoadClosingTagOnSelfClosingClearNoSlash()
+    public function testLoadClosingTagOnSelfClosingClearNoSlash(): void
     {
         $dom = new Dom();
         $dom->setOptions(
diff --git a/tests/Options/PreserveLineBreaks.php b/tests/Options/PreserveLineBreaks.php
index be396490..85179e81 100755
--- a/tests/Options/PreserveLineBreaks.php
+++ b/tests/Options/PreserveLineBreaks.php
@@ -8,7 +8,7 @@
 
 class PreserveLineBreaks extends TestCase
 {
-    public function testPreserveLineBreakTrue()
+    public function testPreserveLineBreakTrue(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setPreserveLineBreaks(true));
@@ -19,7 +19,7 @@ public function testPreserveLineBreakTrue()
         $this->assertEquals("<div class=\"stream-container \">\n<div class=\"stream-item js-new-items-bar-container\"> </div> <div class=\"stream\"></div></div>", (string) $dom);
     }
 
-    public function testPreserveLineBreakBeforeClosingTag()
+    public function testPreserveLineBreakBeforeClosingTag(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setPreserveLineBreaks(true));
diff --git a/tests/Options/SelfClosingTest.php b/tests/Options/SelfClosingTest.php
index f1349821..35cebb20 100644
--- a/tests/Options/SelfClosingTest.php
+++ b/tests/Options/SelfClosingTest.php
@@ -8,7 +8,7 @@
 
 class SelfClosingTest extends TestCase
 {
-    public function testLoadClosingTagAddSelfClosingTag()
+    public function testLoadClosingTagAddSelfClosingTag(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->addSelfClosingTag('mytag'));
@@ -16,7 +16,7 @@ public function testLoadClosingTagAddSelfClosingTag()
         $this->assertEquals('<mytag /><p>Hey bro, <a href="google.com" data-quote="\"">click here</a></p>', $dom->find('div', 0)->innerHtml);
     }
 
-    public function testLoadClosingTagAddSelfClosingTagArray()
+    public function testLoadClosingTagAddSelfClosingTagArray(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->addSelfClosingTags([
@@ -27,7 +27,7 @@ public function testLoadClosingTagAddSelfClosingTagArray()
         $this->assertEquals('<mytag /><p>Hey bro, <a href="google.com" data-quote="\"">click here</a><othertag /></p>', $dom->find('div', 0)->innerHtml);
     }
 
-    public function testLoadClosingTagRemoveSelfClosingTag()
+    public function testLoadClosingTagRemoveSelfClosingTag(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->removeSelfClosingTag('br'));
@@ -35,7 +35,7 @@ public function testLoadClosingTagRemoveSelfClosingTag()
         $this->assertEquals('<br><p>Hey bro, <a href="google.com" data-quote="\"">click here</a></p></br>', $dom->find('div', 0)->innerHtml);
     }
 
-    public function testLoadClosingTagClearSelfClosingTag()
+    public function testLoadClosingTagClearSelfClosingTag(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->clearSelfClosingTags());
diff --git a/tests/Options/StrictTest.php b/tests/Options/StrictTest.php
index 709f292d..3c3e4978 100755
--- a/tests/Options/StrictTest.php
+++ b/tests/Options/StrictTest.php
@@ -9,7 +9,7 @@
 
 class StrictTest extends TestCase
 {
-    public function testConfigStrict()
+    public function testConfigStrict(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setStrict(true));
@@ -17,7 +17,7 @@ public function testConfigStrict()
         $this->assertEquals(' ', $dom->getElementById('hey')->nextSibling()->text);
     }
 
-    public function testConfigStrictMissingSelfClosing()
+    public function testConfigStrictMissingSelfClosing(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setStrict(true));
@@ -31,7 +31,7 @@ public function testConfigStrictMissingSelfClosing()
         }
     }
 
-    public function testConfigStrictMissingAttribute()
+    public function testConfigStrictMissingAttribute(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setStrict(true));
@@ -45,7 +45,7 @@ public function testConfigStrictMissingAttribute()
         }
     }
 
-    public function testConfigStrictBRTag()
+    public function testConfigStrictBRTag(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setStrict(true));
diff --git a/tests/Options/WhitespaceTextNodeTest.php b/tests/Options/WhitespaceTextNodeTest.php
index 245ef7f0..324de67e 100755
--- a/tests/Options/WhitespaceTextNodeTest.php
+++ b/tests/Options/WhitespaceTextNodeTest.php
@@ -8,7 +8,7 @@
 
 class WhitespaceTextNodeTest extends TestCase
 {
-    public function testConfigGlobalNoWhitespaceTextNode()
+    public function testConfigGlobalNoWhitespaceTextNode(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setWhitespaceTextNode(false));
@@ -16,7 +16,7 @@ public function testConfigGlobalNoWhitespaceTextNode()
         $this->assertEquals('Ya you!', $dom->getElementById('hey')->nextSibling()->text);
     }
 
-    public function testConfigLocalOverride()
+    public function testConfigLocalOverride(): void
     {
         $dom = new Dom();
         $dom->setOptions((new Options())->setWhitespaceTextNode(false));
diff --git a/tests/OptionsTest.php b/tests/OptionsTest.php
index 43dd6fb6..abfba2c5 100755
--- a/tests/OptionsTest.php
+++ b/tests/OptionsTest.php
@@ -7,14 +7,14 @@
 
 class OptionsTest extends TestCase
 {
-    public function testDefaultWhitespaceTextNode()
+    public function testDefaultWhitespaceTextNode(): void
     {
         $options = new Options();
 
         $this->assertTrue($options->isWhitespaceTextNode());
     }
 
-    public function testSettingOption()
+    public function testSettingOption(): void
     {
         $options = new Options();
         $options->setStrict(true);
@@ -22,7 +22,7 @@ public function testSettingOption()
         $this->assertTrue($options->isStrict());
     }
 
-    public function testOverwritingOption()
+    public function testOverwritingOption(): void
     {
         $options = new Options();
         $options->setStrict(false);
@@ -35,7 +35,7 @@ public function testOverwritingOption()
         $this->assertFalse($options->isWhitespaceTextNode());
     }
 
-    public function testSetters()
+    public function testSetters(): void
     {
         $options = new Options();
 
diff --git a/tests/Selector/SeekerTest.php b/tests/Selector/SeekerTest.php
index d9e0e824..d6472a6a 100644
--- a/tests/Selector/SeekerTest.php
+++ b/tests/Selector/SeekerTest.php
@@ -8,7 +8,7 @@
 
 class SeekerTest extends TestCase
 {
-    public function testSeekReturnEmptyArray()
+    public function testSeekReturnEmptyArray(): void
     {
         $ruleDTO = RuleDTO::makeFromPrimitives(
             'tag',
diff --git a/tests/Selector/SelectorTest.php b/tests/Selector/SelectorTest.php
index 9ef2705d..d6887e20 100755
--- a/tests/Selector/SelectorTest.php
+++ b/tests/Selector/SelectorTest.php
@@ -10,35 +10,35 @@
 
 class SelectorTest extends TestCase
 {
-    public function testParseSelectorStringId()
+    public function testParseSelectorStringId(): void
     {
         $selector = new Selector('#all', new Parser());
         $selectors = $selector->getParsedSelectorCollectionDTO();
         $this->assertEquals('id', $selectors->getParsedSelectorDTO()[0]->getRules()[0]->getKey());
     }
 
-    public function testParseSelectorStringClass()
+    public function testParseSelectorStringClass(): void
     {
         $selector = new Selector('div.post', new Parser());
         $selectors = $selector->getParsedSelectorCollectionDTO();
         $this->assertEquals('class', $selectors->getParsedSelectorDTO()[0]->getRules()[0]->getKey());
     }
 
-    public function testParseSelectorStringAttribute()
+    public function testParseSelectorStringAttribute(): void
     {
         $selector = new Selector('div[visible=yes]', new Parser());
         $selectors = $selector->getParsedSelectorCollectionDTO();
         $this->assertEquals('yes', $selectors->getParsedSelectorDTO()[0]->getRules()[0]->getValue());
     }
 
-    public function testParseSelectorStringNoKey()
+    public function testParseSelectorStringNoKey(): void
     {
         $selector = new Selector('div[!visible]', new Parser());
         $selectors = $selector->getParsedSelectorCollectionDTO();
         $this->assertTrue($selectors->getParsedSelectorDTO()[0]->getRules()[0]->isNoKey());
     }
 
-    public function testFind()
+    public function testFind(): void
     {
         $root = new HtmlNode('root');
         $parent = new HtmlNode('div');
@@ -52,7 +52,7 @@ public function testFind()
         $this->assertEquals($child1->id(), $selector->find($root)[0]->id());
     }
 
-    public function testFindId()
+    public function testFindId(): void
     {
         $parent = new HtmlNode(new Tag('div'));
         $child1 = new HtmlNode(new Tag('a'));
@@ -70,7 +70,7 @@ public function testFindId()
         $this->assertEquals($child2->id(), $selector->find($parent)[0]->id());
     }
 
-    public function testFindClass()
+    public function testFindClass(): void
     {
         $parent = new HtmlNode(new Tag('div'));
         $child1 = new HtmlNode(new Tag('a'));
@@ -90,7 +90,7 @@ public function testFindClass()
         $this->assertEquals($child3->id(), $selector->find($parent)[0]->id());
     }
 
-    public function testFindClassMultiple()
+    public function testFindClassMultiple(): void
     {
         $parent = new HtmlNode(new Tag('div'));
         $child1 = new HtmlNode(new Tag('a'));
@@ -110,7 +110,7 @@ public function testFindClassMultiple()
         $this->assertEquals($child3->id(), $selector->find($parent)[0]->id());
     }
 
-    public function testFindWild()
+    public function testFindWild(): void
     {
         $root = new HtmlNode(new Tag('root'));
         $parent = new HtmlNode(new Tag('div'));
@@ -126,7 +126,7 @@ public function testFindWild()
         $this->assertEquals($child3->id(), $selector->find($root)[0]->id());
     }
 
-    public function testFindMultipleSelectors()
+    public function testFindMultipleSelectors(): void
     {
         $root = new HtmlNode(new Tag('root'));
         $parent = new HtmlNode(new Tag('div'));
@@ -142,7 +142,7 @@ public function testFindMultipleSelectors()
         $this->assertEquals(3, \count($selector->find($root)));
     }
 
-    public function testFindXpathKeySelector()
+    public function testFindXpathKeySelector(): void
     {
         $parent = new HtmlNode(new Tag('div'));
         $child1 = new HtmlNode(new Tag('a'));
@@ -162,7 +162,7 @@ public function testFindXpathKeySelector()
         $this->assertEquals($parent->id(), $selector->find($parent)[0]->id());
     }
 
-    public function testFindChildMultipleLevelsDeep()
+    public function testFindChildMultipleLevelsDeep(): void
     {
         $root = new HtmlNode(new Tag('root'));
         $parent = new HtmlNode(new Tag('div'));
@@ -176,7 +176,7 @@ public function testFindChildMultipleLevelsDeep()
         $this->assertEquals(1, \count($selector->find($root)));
     }
 
-    public function testFindAllChildren()
+    public function testFindAllChildren(): void
     {
         $root = new HtmlNode(new Tag('root'));
         $parent = new HtmlNode(new Tag('div'));
@@ -192,7 +192,7 @@ public function testFindAllChildren()
         $this->assertEquals(2, \count($selector->find($root)));
     }
 
-    public function testFindChildUsingChildSelector()
+    public function testFindChildUsingChildSelector(): void
     {
         $root = new HtmlNode(new Tag('root'));
         $parent = new HtmlNode(new Tag('div'));
@@ -208,7 +208,7 @@ public function testFindChildUsingChildSelector()
         $this->assertEquals(1, \count($selector->find($root)));
     }
 
-    public function testFindNodeByAttributeOnly()
+    public function testFindNodeByAttributeOnly(): void
     {
         $root = new HtmlNode(new Tag('root'));
         $child1 = new HtmlNode(new Tag('ul'));
@@ -219,7 +219,7 @@ public function testFindNodeByAttributeOnly()
         $this->assertEquals(1, \count($selector->find($root)));
     }
 
-    public function testFindMultipleClasses()
+    public function testFindMultipleClasses(): void
     {
         $root = new HtmlNode(new Tag('root'));
         $child1 = new HtmlNode(new Tag('a'));
diff --git a/tests/StaticDomTest.php b/tests/StaticDomTest.php
index 73453633..75daaf39 100755
--- a/tests/StaticDomTest.php
+++ b/tests/StaticDomTest.php
@@ -7,17 +7,17 @@
 
 class StaticDomTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         StaticDom::mount();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         StaticDom::unload();
     }
 
-    public function testMountWithDom()
+    public function testMountWithDom(): void
     {
         $dom = new PHPHtmlParser\Dom();
         StaticDom::unload();
@@ -25,40 +25,38 @@ public function testMountWithDom()
         $this->assertTrue($status);
     }
 
-    public function testloadStr()
+    public function testloadStr(): void
     {
         $dom = Dom::loadStr('<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()
+    public function testLoadWithFile(): void
     {
         $dom = Dom::loadFromFile('tests/data/files/small.html');
         $this->assertEquals('VonBurgermeister', $dom->find('.post-user font', 0)->text);
     }
 
-    public function testLoadFromFile()
+    public function testLoadFromFile(): void
     {
         $dom = Dom::loadFromFile('tests/data/files/small.html');
         $this->assertEquals('VonBurgermeister', $dom->find('.post-user font', 0)->text);
     }
 
-    /**
-     * @expectedException \PHPHtmlParser\Exceptions\NotLoadedException
-     */
-    public function testFindNoloadStr()
+    public function testFindNoloadStr(): void
     {
+        $this->expectException(\PHPHtmlParser\Exceptions\NotLoadedException::class);
         Dom::find('.post-user font', 0);
     }
 
-    public function testFindI()
+    public function testFindI(): void
     {
         Dom::loadFromFile('tests/data/files/big.html');
         $this->assertEquals('В кустах блестит металл<br /> И искрится ток<br /> Человечеству конец', Dom::find('i')[1]->innerHtml);
     }
 
-    public function testLoadFromUrl()
+    public function testLoadFromUrl(): void
     {
         $streamMock = Mockery::mock(\Psr\Http\Message\StreamInterface::class);
         $streamMock->shouldReceive('getContents')

From 3ad9d5b19473022df318e14159e49398bc6eb645 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 10 Oct 2022 13:55:02 +0300
Subject: [PATCH 03/15] Add .phpunit.result.cache to .gitignore.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 9a550fad..d8a5dfc8 100755
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ infection.log
 /vendor/
 .idea/
 .php_cs.cache
+.phpunit.result.cache
 *.swp

From bfa8f16937c2c941557e0a107da9a354f641b7da Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 10 Oct 2022 14:03:49 +0300
Subject: [PATCH 04/15] Migrate phpunit configuration.

---
 phpunit.xml | 41 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/phpunit.xml b/phpunit.xml
index 04b1d77d..16740cab 100755
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,29 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-    backupStaticAttributes="false"
-    bootstrap="phpunit.php"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    beStrictAboutChangesToGlobalState="true"
-    beStrictAboutTestsThatDoNotTestAnything="true"
-    executionOrder="random"
->
-    <testsuites>
-        <testsuite name="Repository Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="false">
-            <directory suffix=".php">src</directory>
-            <exclude>
-                <directory suffix=".php">vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="phpunit.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" beStrictAboutChangesToGlobalState="true" beStrictAboutTestsThatDoNotTestAnything="true" executionOrder="random" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage includeUncoveredFiles="false">
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">vendor</directory>
+    </exclude>
+  </coverage>
+  <testsuites>
+    <testsuite name="Repository Test Suite">
+      <directory>./tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

From 600cb847e06931e078dd4c11c5f6eb52fe376c0e Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 10 Oct 2022 14:11:39 +0300
Subject: [PATCH 05/15] Fix comment parsing and extend tests.

Fixes https://github.com/paquettg/php-html-parser/issues/258 and https://github.com/paquettg/php-html-parser/issues/274.
---
 src/PHPHtmlParser/Dom/Parser.php |  2 +-
 tests/Dom/CommentTest.php        | 34 ++++++++++++++++++--------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/PHPHtmlParser/Dom/Parser.php b/src/PHPHtmlParser/Dom/Parser.php
index 7ed310cb..a952dc79 100644
--- a/src/PHPHtmlParser/Dom/Parser.php
+++ b/src/PHPHtmlParser/Dom/Parser.php
@@ -186,7 +186,7 @@ private function parseTag(Options $options, Content $content, int $size): TagDTO
         } elseif($content->string(3) == '!--') {
             // comment tag
             $tag = $content->fastForward(3)
-                ->copyByToken(StringToken::CLOSECOMMENT(), true);
+                ->copyByToken(StringToken::CLOSECOMMENT(), false);
             $tag = (new Tag($tag))
                 ->setOpening('<!--')
                 ->setClosing('-->')
diff --git a/tests/Dom/CommentTest.php b/tests/Dom/CommentTest.php
index a26a3098..d28ee817 100644
--- a/tests/Dom/CommentTest.php
+++ b/tests/Dom/CommentTest.php
@@ -9,26 +9,30 @@
 class CommentTest extends TestCase
 {
     /**
-     * @var Dom
+     * Data provider for testComment
+     *
+     * @return array
      */
-    private $dom;
+    public function getTestCommentData(): array
+    {
+        return [
+            ['<!-- test comment with number 2 -->'],
+            ['<!--<div><img />-->'],
+            ['<!--[if (gte IE 6)&(lte IE 8)]><script src="https://www.random.test.js" /></script><![endif]-->'],
+        ];
+    }
 
-    public function setUp(): void
+    /**
+     * Test comment handling
+     *
+     * @dataProvider getTestCommentData
+     */
+    public function testComment($comment): void
     {
         $dom = new Dom();
         $options = new Options();
         $options->setCleanupInput(false);
-        $dom->loadStr('<!-- test comment with number 2 -->', $options);
-        $this->dom = $dom;
-    }
-
-    public function tearDown(): void
-    {
-        Mockery::close();
-    }
-
-    public function testLoadCommentInnerHtml(): void
-    {
-        $this->assertEquals('<!-- test comment with number 2 -->', $this->dom->innerHtml);
+        $dom->loadStr($comment, $options);
+        $this->assertEquals($comment, $dom->innerHtml);
     }
 }

From 3dfa78b3fafbe87e0b676eab6f2e3167bb75a492 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 10 Oct 2022 14:20:25 +0300
Subject: [PATCH 06/15] Switch to GitHub Actions.

A simplified build for now.
---
 .github/FUNDING.yml       | 12 -----------
 .github/workflows/ci.yaml | 42 +++++++++++++++++++++++++++++++++++++++
 .travis.yml               | 19 ------------------
 3 files changed, 42 insertions(+), 31 deletions(-)
 delete mode 100644 .github/FUNDING.yml
 create mode 100644 .github/workflows/ci.yaml
 delete mode 100755 .travis.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index 8fe59770..00000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-# github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-# patreon: # Replace with a single Patreon username
-# open_collective: # Replace with a single Open Collective username
-# ko_fi: # Replace with a single Ko-fi username
-tidelift: "packagist/paquettg/php-html-parser"
-# community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-# liberapay: # Replace with a single Liberapay username
-# issuehunt: # Replace with a single IssueHunt username
-# otechie: # Replace with a single Otechie username
-# custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
new file mode 100644
index 00000000..4058be1f
--- /dev/null
+++ b/.github/workflows/ci.yaml
@@ -0,0 +1,42 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  run-tests:
+    name: Tests with PHP ${{ matrix.php-version }}
+    runs-on: ubuntu-latest
+    env:
+      VUFIND_HOME: $GITHUB_WORKSPACE
+      VUFIND_LOCAL_DIR: $GITHUB_WORKSPACE/local
+    strategy:
+      matrix:
+        php-version: ['7.4', '8.0', '8.1']
+
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: intl, xsl
+          tools: composer:2
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install composer dependencies
+        run: composer install --dev --no-interaction
+
+      - name: Run tests
+        run: vendor/bin/phpunit
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100755
index 25ba270f..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-language: php
-
-php:
-  - 7.2
-  - 7.3
-  - 7.4
-
-install:
-  - composer self-update
-  - composer install --dev --no-interaction
-
-script:
-  - mkdir -p build/logs
-  - php vendor/bin/phpunit --coverage-clover build/logs/clover.xml
-
-after_success:
-  - travis_retry php vendor/bin/php-coveralls -v
-  - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml

From c126251cec2c2da5618104234201311bd4b4d201 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 10 Oct 2022 14:40:47 +0300
Subject: [PATCH 07/15] Update README, CHANGELOG, LICENCE and links.

---
 CHANGELOG.md  | 14 +++++++++++++-
 LICENSE.md    |  1 +
 README.md     | 25 +++++++++----------------
 composer.json |  6 +++---
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fbf0bb4..4e62a2b7 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,11 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 4.0.0
+
+### Added
+- Added support for PHP 8.1, including development environment.
+
+### Changed
+- Fixed comment tag parsing.
+- Updated dependencies including phpunit.
+
+### Removed
+- Dropped support for PHP versions prior to 7.4.7.
+
 ## 3.1.1
 
 ### Changed
 - Fixed issue with numbers in comments.
-- Updated minimume php version to correct version.
+- Updated minimum php version to correct version.
 - Comment tags are now self-closing when cleanup input is set to false.
 
 ## 3.1.0
diff --git a/LICENSE.md b/LICENSE.md
index 4549f9c3..b572b06d 100755
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2014 Gilles Paquette
+Copyright (c) 2022 University of Helsinki, National library of Finland
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 6889b079..445ebaa3 100755
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 PHP Html Parser
 ==========================
 
-[![Build Status](https://travis-ci.org/paquettg/php-html-parser.png)](https://travis-ci.org/paquettg/php-html-parser)
-[![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)
+**Forked from paquettg/php-html-parser**
+
+[![CI](https://github.com/NatLibFi/php-html-parser/actions/workflows/ci.yaml/badge.svg)](https://github.com/NatLibFi/php-html-parser/actions/workflows/ci.yaml)
 
 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!
 
@@ -13,10 +13,10 @@ Install
 Install the latest version using composer.
 
 ```bash
-$ composer require paquettg/php-html-parser
+$ composer require natlibfi/php-html-parser
 ```
 
-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 7.2, 7.3, and 7.4.
+This package can be found on [packagist](https://packagist.org/packages/natlibfi/php-html-parser) and is best loaded using [composer](http://getcomposer.org/). We support php 7.4, 8.0 and 8.1.
 
 Basic Usage
 -----
@@ -36,13 +36,6 @@ echo $a->text; // "click here"
 
 The above will output "click here". Simple, no? There are many ways to get the same result from the DOM, such as `$dom->getElementsbyTag('a')[0]` or `$dom->find('a', 0)`, which can all be found in the tests or in the code itself.
 
-Support PHP Html Parser Financially
---------------
-
-Get supported Monolog and help fund the project with the [Tidelift Subscription](https://tidelift.com/subscription/pkg/packagist-paquettg-php-html-parser?utm_source=packagist-paquettg-php-html-parser&utm_medium=referral&utm_campaign=enterprise).
-
-Tidelift delivers commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use.
-
 Loading Files
 ------------------
 
@@ -62,7 +55,7 @@ foreach ($contents as $content)
 {
 	// get the class attr
 	$class = $content->getAttribute('class');
-	
+
 	// do something with the html
 	$html = $content->innerHtml;
 
@@ -77,7 +70,7 @@ This example loads the html from big.html, a real page found online, and gets al
 Loading URLs
 ----------------
 
-Loading a URL is very similar to the way you would load the HTML from a file. 
+Loading a URL is very similar to the way you would load the HTML from a file.
 
 ```php
 // Assuming you installed from Composer:
@@ -141,7 +134,7 @@ $dom->setOptions(
         ->setStrict(true)
 );
 
-$dom->loadFromUrl('http://google.com', 
+$dom->loadFromUrl('http://google.com',
     (new Options())->setWhitespaceTextNode(false) // only applies to this load.
 );
 
@@ -160,7 +153,7 @@ The whitespaceTextNode, by default true, option tells the parser to save textnod
 
 **enforceEncoding**
 
-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. 
+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**
 
diff --git a/composer.json b/composer.json
index 16775751..7992cfd6 100755
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
 {
-    "name": "paquettg/php-html-parser",
+    "name": "NatLibFi/php-html-parser",
     "type": "library",
     "description": "An HTML DOM parser. It allows you to manipulate HTML. Find tags on an HTML page with selectors just like jQuery.",
     "keywords": ["html", "dom", "parser"],
-    "homepage": "https://github.com/paquettg/php-html-parser",
+    "homepage": "https://github.com/NatLibFi/php-html-parser",
     "license": "MIT",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=7.4",
+        "php": ">=7.4.7",
         "ext-mbstring": "*",
         "ext-zlib": "*",
         "ext-curl": "*",

From c5e22f78e9f0571f8bf3ee124235c030348307d3 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 10 Oct 2022 14:42:24 +0300
Subject: [PATCH 08/15] Fix package name to lowercase.

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7992cfd6..b19143a6 100755
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "NatLibFi/php-html-parser",
+    "name": "natlibfi/php-html-parser",
     "type": "library",
     "description": "An HTML DOM parser. It allows you to manipulate HTML. Find tags on an HTML page with selectors just like jQuery.",
     "keywords": ["html", "dom", "parser"],

From 4d0612b0491842eef37bf352bdb10055f2748625 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 10 Oct 2022 14:44:44 +0300
Subject: [PATCH 09/15] Update SECURITY.

---
 SECURITY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index 3fc4dfcc..ca5aa217 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,6 +6,6 @@ We only support the most recent version with security fixes.
 
 ## Reporting a Vulnerability
 
-If you have found any issues that might have security implications, please refer to https://tidelift.com/security
+If you have found any issues that might have security implications, please refer to https://www.helsinki.fi/en/it/information-security-contact-details
 
 Do not report security reports publicly.

From ee2bce5952d553304b385a47a89f1f7eb8f67dd3 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 10 Oct 2022 14:45:41 +0300
Subject: [PATCH 10/15] Add .vscode to .gitignore.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index d8a5dfc8..029ab282 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ composer.lock
 infection.log
 /vendor/
 .idea/
+.vscode/
 .php_cs.cache
 .phpunit.result.cache
 *.swp

From 97b13a4613bf3dd39ae675b034fb615a68d54d12 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 10 Oct 2022 15:07:55 +0300
Subject: [PATCH 11/15] Update php-cs-fixer configuration.

---
 .gitignore             |   2 +-
 .php-cs-fixer.dist.php | 153 +++++++++++++++++++++++++++++++++++++++++
 .php_cs.dist           | 149 ---------------------------------------
 3 files changed, 154 insertions(+), 150 deletions(-)
 create mode 100644 .php-cs-fixer.dist.php
 delete mode 100644 .php_cs.dist

diff --git a/.gitignore b/.gitignore
index 029ab282..e5f90eea 100755
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,6 @@ infection.log
 /vendor/
 .idea/
 .vscode/
-.php_cs.cache
+.php_cs_cache
 .phpunit.result.cache
 *.swp
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
new file mode 100644
index 00000000..eebb147d
--- /dev/null
+++ b/.php-cs-fixer.dist.php
@@ -0,0 +1,153 @@
+<?php
+
+$finder = new PhpCsFixer\Finder();
+$finder->in('src');
+$finder->in('tests');
+
+$rules = [
+        'array_indentation' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'binary_operator_spaces' => [],
+        'blank_line_after_namespace' => true,
+        'blank_line_after_opening_tag' => true,
+        'blank_line_before_statement' => ['statements'=>['return']],
+        'braces' => ['allow_single_line_closure' => false],
+        'cast_spaces' => true,
+        'class_attributes_separation' => [],
+        'class_definition' => ['single_line'=>true],
+        'combine_consecutive_issets' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'declare_equal_normalize' => true,
+        'elseif' => true,
+        'encoding' => true,
+        'full_opening_tag' => true,
+        'function_declaration' => true,
+        'function_typehint_space' => true,
+        'include' => true,
+        'increment_style' => true,
+        'indentation_type' => true,
+        'line_ending' => true,
+        'linebreak_after_opening_tag' => true,
+        'lowercase_cast' => true,
+        'lowercase_keywords' => true,
+        'lowercase_static_reference' => true,
+        'magic_constant_casing' => true,
+        'magic_method_casing' => true,
+        'mb_str_functions' => false,
+        'method_argument_space' => true,
+        'native_function_casing' => true,
+        'native_function_invocation' => [],
+        'native_function_type_declaration_casing' => true,
+        'new_with_braces' => true,
+        'no_blank_lines_after_class_opening' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'no_break_comment' => true,
+        'no_closing_tag' => true,
+        'no_empty_comment' => true,
+        'no_empty_phpdoc' => true,
+        'no_empty_statement' => true,
+        'no_extra_blank_lines' => [
+            'tokens'=> [
+                'curly_brace_block',
+                'extra',
+                'parenthesis_brace_block',
+                'square_brace_block',
+                'throw',
+                'use',
+            ]
+        ],
+        'no_leading_import_slash' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_mixed_echo_print' => true,
+        'no_multiline_whitespace_around_double_arrow' => true,
+        'no_short_bool_cast' => true,
+        'no_singleline_whitespace_before_semicolons' => true,
+        'no_superfluous_elseif' => true,
+        'no_spaces_after_function_name' => true,
+        'no_spaces_around_offset' => true,
+        'no_spaces_inside_parenthesis' => true,
+        'no_superfluous_phpdoc_tags' => ['allow_mixed' => true, 'allow_unused_params' => true],
+        'no_trailing_comma_in_singleline' => true,
+        'no_trailing_whitespace' => true,
+        'no_trailing_whitespace_in_comment' => true,
+        'no_unneeded_control_parentheses' => true,
+        'no_unneeded_curly_braces' => ['namespaces' => true],
+        'no_unused_imports' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'no_whitespace_before_comma_in_array' => true,
+        'no_whitespace_in_blank_line' => true,
+        'normalize_index_brace' => true,
+        'not_operator_with_space' => false,
+        'object_operator_without_whitespace' => true,
+        'ordered_class_elements' => true,
+        'ordered_imports' => true,
+        'php_unit_fqcn_annotation' => true,
+        'phpdoc_align' => ['tags' => [
+                                          'method',
+                                          'param',
+                                          'property',
+                                          'property-read',
+                                          'return',
+                                          'throws',
+                                          'type',
+                                          'var',
+                                      ]],
+        'phpdoc_add_missing_param_annotation' => true,
+        'phpdoc_annotation_without_dot' => true,
+        'phpdoc_indent' => true,
+        'phpdoc_inline_tag_normalizer' => true,
+        'phpdoc_no_access' => true,
+        'phpdoc_no_alias_tag' => false,
+        'phpdoc_no_package' => true,
+        'phpdoc_no_useless_inheritdoc' => true,
+        'phpdoc_order' => true,
+        'phpdoc_return_self_reference' => true,
+        'phpdoc_scalar' => true,
+        'phpdoc_separation' => true,
+        'phpdoc_single_line_var_spacing' => true,
+        'phpdoc_summary' => true,
+        'phpdoc_to_comment' => true,
+        'phpdoc_trim_consecutive_blank_line_separation' => true,
+        'phpdoc_types' => true,
+        'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
+        'phpdoc_var_without_name' => true,
+        'return_assignment' => true,
+        'return_type_declaration' => true,
+        'semicolon_after_instruction' => true,
+        'simplified_null_return' => true,
+        'short_scalar_cast' => true,
+        'single_blank_line_at_eof' => true,
+        'single_blank_line_before_namespace' => true,
+        'single_class_element_per_statement' => true,
+        'single_import_per_statement' => true,
+        'single_line_after_imports' => true,
+        'single_line_comment_style' => ['comment_types' => ['hash']],
+        'single_line_throw' => true,
+        'single_quote' => true,
+        'single_trait_insert_per_statement' => true,
+        'space_after_semicolon' => ['remove_in_empty_for_expressions'=>true],
+        'standardize_increment' => true,
+        'standardize_not_equals' => true,
+        'switch_case_semicolon_to_colon' => true,
+        'switch_case_space' => true,
+        'ternary_operator_spaces' => true,
+        'ternary_to_null_coalescing' => true,
+        'trailing_comma_in_multiline' => true,
+        'trim_array_spaces' => true,
+        'unary_operator_spaces' => true,
+        'visibility_required' => true,
+        'whitespace_after_comma_in_array' => true,
+        'yoda_style' => false,
+    ];
+
+$cacheDir = __DIR__ . '/.php_cs_cache';
+if (!is_dir($cacheDir)) {
+    mkdir($cacheDir);
+}
+
+$config = new PhpCsFixer\Config();
+return $config->setCacheFile($cacheDir . '/.code.cache')
+    ->setRiskyAllowed(true)
+    ->setRules($rules)
+    ->setFinder($finder);
diff --git a/.php_cs.dist b/.php_cs.dist
deleted file mode 100644
index 2ead7195..00000000
--- a/.php_cs.dist
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-$finder = PhpCsFixer\Finder::create()
-	->in('src')
-	->in('tests')
-;
-
-return PhpCsFixer\Config::create()
-	->setRiskyAllowed(true)
-	->setRules([
-		'array_indentation' => true,
-		'array_syntax' => ['syntax' => 'short'],
-		'binary_operator_spaces' => ['align_double_arrow'=>true],
-		'blank_line_after_namespace' => true,
-		'blank_line_after_opening_tag' => true,
-		'blank_line_before_statement' => ['statements'=>['return']],
-		'braces' => ['allow_single_line_closure' => false],
-		'cast_spaces' => true,
-		'class_attributes_separation' => ['elements'=>['method']],
-		'class_definition' => ['single_line'=>true],
-		'combine_consecutive_issets' => true,
-		'concat_space' => ['spacing' => 'one'],
-		'declare_equal_normalize' => true,
-		'elseif' => true,
-		'encoding' => true,
-		'full_opening_tag' => true,
-		'function_declaration' => true,
-		'function_typehint_space' => true,
-		'include' => true,
-		'increment_style' => true,
-		'indentation_type' => true,
-		'line_ending' => true,
-		'linebreak_after_opening_tag' => true,
-		'lowercase_cast' => true,
-		'lowercase_keywords' => true,
-		'lowercase_static_reference' => true,
-		'magic_constant_casing' => true,
-		'magic_method_casing' => true,
-		'mb_str_functions' => false,
-		'method_argument_space' => true,
-		'native_function_casing' => true,
-		'native_function_invocation' => true,
-		'native_function_type_declaration_casing' => true,
-		'new_with_braces' => true,
-		'no_blank_lines_after_class_opening' => true,
-		'no_blank_lines_after_phpdoc' => true,
-		'no_break_comment' => true,
-		'no_closing_tag' => true,
-		'no_empty_comment' => true,
-		'no_empty_phpdoc' => true,
-		'no_empty_statement' => true,
-		'no_extra_blank_lines' => ['tokens'=>[
-                                                 'curly_brace_block',
-                                                 'extra',
-                                                 'parenthesis_brace_block',
-                                                 'square_brace_block',
-                                                 'throw',
-                                                 'use',
-                                             ]],
-        'no_leading_import_slash' => true,
-        'no_leading_namespace_whitespace' => true,
-        'no_mixed_echo_print' => true,
-        'no_multiline_whitespace_around_double_arrow' => true,
-		'no_null_property_initialization' => true,
-        'no_short_bool_cast' => true,
-        'no_singleline_whitespace_before_semicolons' => true,
-		'no_superfluous_elseif' => true,
-		'no_spaces_after_function_name' => true,
-		'no_spaces_around_offset' => true,
-		'no_spaces_inside_parenthesis' => true,
-		'no_superfluous_phpdoc_tags' => ['allow_mixed' => true, 'allow_unused_params' => true],
-		'no_trailing_comma_in_list_call' => true,
-		'no_trailing_comma_in_singleline_array' => true,
-		'no_trailing_whitespace' => true,
-		'no_trailing_whitespace_in_comment' => true,
-		'no_unneeded_control_parentheses' => true,
-		'no_unneeded_curly_braces' => ['namespaces' => true],
-		'no_unused_imports' => true,
-		'no_useless_else' => true,
-		'no_useless_return' => true,
-		'no_whitespace_before_comma_in_array' => true,
-		'no_whitespace_in_blank_line' => true,
-		'normalize_index_brace' => true,
-		'not_operator_with_space' => false,
-		'object_operator_without_whitespace' => true,
-		'ordered_class_elements' => true,
-		'ordered_imports' => true,
-		'php_unit_fqcn_annotation' => true,
-		'phpdoc_align' => ['tags' => [
-		                                  'method',
-                                          'param',
-                                          'property',
-                                          'property-read',
-                                          'return',
-                                          'throws',
-                                          'type',
-                                          'var',
-                                      ]],
-		'phpdoc_add_missing_param_annotation' => true,
-        'phpdoc_annotation_without_dot' => true,
-        'phpdoc_indent' => true,
-        'phpdoc_inline_tag' => true,
-        'phpdoc_no_access' => true,
-        'phpdoc_no_alias_tag' => false,
-        'phpdoc_no_package' => true,
-        'phpdoc_no_useless_inheritdoc' => true,
-		'phpdoc_order' => true,
-		'phpdoc_return_self_reference' => true,
-		'phpdoc_scalar' => true,
-		'phpdoc_separation' => true,
-		'phpdoc_single_line_var_spacing' => true,
-		'phpdoc_summary' => true,
-		'phpdoc_to_comment' => true,
-		'phpdoc_trim' => true,
-		'phpdoc_trim_consecutive_blank_line_separation' => true,
-		'phpdoc_types' => true,
-		'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
-		'phpdoc_var_without_name' => true,
-		'return_assignment' => true,
-		'return_type_declaration' => true,
-		'semicolon_after_instruction' => true,
-		'simplified_null_return' => true,
-		'short_scalar_cast' => true,
-		'single_blank_line_at_eof' => true,
-		'single_blank_line_before_namespace' => true,
-		'single_class_element_per_statement' => true,
-		'single_import_per_statement' => true,
-		'single_line_after_imports' => true,
-		'single_line_comment_style' => ['comment_types' => ['hash']],
-		'single_line_throw' => true,
-		'single_quote' => true,
-		'single_trait_insert_per_statement' => true,
-		'space_after_semicolon' => ['remove_in_empty_for_expressions'=>true],
-		'standardize_increment' => true,
-		'standardize_not_equals' => true,
-		'switch_case_semicolon_to_colon' => true,
-		'switch_case_space' => true,
-		'ternary_operator_spaces' => true,
-		'ternary_to_null_coalescing' => true,
-		'trailing_comma_in_multiline_array' => true,
-		'trim_array_spaces' => true,
-		'unary_operator_spaces' => true,
-		'visibility_required' => true,
-		'whitespace_after_comma_in_array' => true,
-		'yoda_style' => false,
-	])
-	->setFinder($finder)
-	->setCacheFile(__DIR__.'/.php_cs.cache')
-;
\ No newline at end of file

From 0899433653cec0b2711fd4f236299807372d6b88 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 10 Oct 2022 15:09:15 +0300
Subject: [PATCH 12/15] Apply php-cs-fixer.

---
 src/PHPHtmlParser/Content.php         |  3 +--
 src/PHPHtmlParser/Dom.php             |  2 +-
 src/PHPHtmlParser/Dom/Parser.php      |  2 +-
 src/PHPHtmlParser/Dom/Tag.php         |  2 +-
 src/PHPHtmlParser/Selector/Seeker.php | 12 ++++++++----
 src/PHPHtmlParser/StaticDom.php       |  2 +-
 tests/Dom/CommentTest.php             |  7 ++++---
 tests/DomTest.php                     | 11 +++++++----
 tests/Node/TextTest.php               |  1 -
 tests/Options/CleanupTest.php         | 12 ++++++++----
 10 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/PHPHtmlParser/Content.php b/src/PHPHtmlParser/Content.php
index f1332175..19ad2e55 100755
--- a/src/PHPHtmlParser/Content.php
+++ b/src/PHPHtmlParser/Content.php
@@ -75,8 +75,6 @@ public function char(?int $char = null): string
     /**
      * Gets a string from the current character position.
      *
-     * @param int $length
-     * @return string
      */
     public function string(int $length = 1): string
     {
@@ -85,6 +83,7 @@ public function string(int $length = 1): string
         do {
             $string .= $this->char($position++);
         } while ($position < $this->pos + $length);
+
         return $string;
     }
 
diff --git a/src/PHPHtmlParser/Dom.php b/src/PHPHtmlParser/Dom.php
index 816b1b3b..0b6ac475 100755
--- a/src/PHPHtmlParser/Dom.php
+++ b/src/PHPHtmlParser/Dom.php
@@ -4,8 +4,8 @@
 
 namespace PHPHtmlParser;
 
-use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Client;
+use GuzzleHttp\Psr7\Request;
 use PHPHtmlParser\Contracts\Dom\CleanerInterface;
 use PHPHtmlParser\Contracts\Dom\ParserInterface;
 use PHPHtmlParser\Contracts\DomInterface;
diff --git a/src/PHPHtmlParser/Dom/Parser.php b/src/PHPHtmlParser/Dom/Parser.php
index a952dc79..250371e0 100644
--- a/src/PHPHtmlParser/Dom/Parser.php
+++ b/src/PHPHtmlParser/Dom/Parser.php
@@ -183,7 +183,7 @@ private function parseTag(Options $options, Content $content, int $size): TagDTO
                 ->setOpening('<?')
                 ->setClosing(' ?>')
                 ->selfClosing();
-        } elseif($content->string(3) == '!--') {
+        } elseif ($content->string(3) == '!--') {
             // comment tag
             $tag = $content->fastForward(3)
                 ->copyByToken(StringToken::CLOSECOMMENT(), false);
diff --git a/src/PHPHtmlParser/Dom/Tag.php b/src/PHPHtmlParser/Dom/Tag.php
index 2aeb6aa8..08ebb454 100644
--- a/src/PHPHtmlParser/Dom/Tag.php
+++ b/src/PHPHtmlParser/Dom/Tag.php
@@ -330,7 +330,7 @@ public function makeOpeningTag()
                 // attribute that was in the array not found in the array... let's continue.
                 continue;
             } catch (\TypeError $e) {
-              $val = null;
+                $val = null;
             }
             $val = $attributeDTO->getValue();
             if (\is_null($val)) {
diff --git a/src/PHPHtmlParser/Selector/Seeker.php b/src/PHPHtmlParser/Selector/Seeker.php
index abd6dc4e..6e9f60fb 100644
--- a/src/PHPHtmlParser/Selector/Seeker.php
+++ b/src/PHPHtmlParser/Selector/Seeker.php
@@ -298,11 +298,15 @@ private function match(
             case '!=':
                 return $value !== $pattern;
             case '^=':
-                return \preg_match('/^' . \preg_quote($pattern, '/') . '/',
-                        $value) == 1;
+                return \preg_match(
+                    '/^' . \preg_quote($pattern, '/') . '/',
+                    $value
+                ) == 1;
             case '$=':
-                return \preg_match('/' . \preg_quote($pattern, '/') . '$/',
-                        $value) == 1;
+                return \preg_match(
+                    '/' . \preg_quote($pattern, '/') . '$/',
+                    $value
+                ) == 1;
             case '*=':
                 if ($pattern[0] == '/') {
                     return \preg_match($pattern, $value) == 1;
diff --git a/src/PHPHtmlParser/StaticDom.php b/src/PHPHtmlParser/StaticDom.php
index 78950204..b4a2a3a4 100755
--- a/src/PHPHtmlParser/StaticDom.php
+++ b/src/PHPHtmlParser/StaticDom.php
@@ -4,8 +4,8 @@
 
 namespace PHPHtmlParser;
 
-use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Client;
+use GuzzleHttp\Psr7\Request;
 use PHPHtmlParser\Exceptions\ChildNotFoundException;
 use PHPHtmlParser\Exceptions\CircularException;
 use PHPHtmlParser\Exceptions\NotLoadedException;
diff --git a/tests/Dom/CommentTest.php b/tests/Dom/CommentTest.php
index d28ee817..f2fae79f 100644
--- a/tests/Dom/CommentTest.php
+++ b/tests/Dom/CommentTest.php
@@ -9,9 +9,8 @@
 class CommentTest extends TestCase
 {
     /**
-     * Data provider for testComment
+     * Data provider for testComment.
      *
-     * @return array
      */
     public function getTestCommentData(): array
     {
@@ -23,9 +22,11 @@ public function getTestCommentData(): array
     }
 
     /**
-     * Test comment handling
+     * Test comment handling.
      *
      * @dataProvider getTestCommentData
+     *
+     * @param mixed $comment
      */
     public function testComment($comment): void
     {
diff --git a/tests/DomTest.php b/tests/DomTest.php
index 260b751d..9bf415b2 100755
--- a/tests/DomTest.php
+++ b/tests/DomTest.php
@@ -138,8 +138,10 @@ public function testLoadFileBigTwice(): void
     public function testLoadFileBigTwicePreserveOption(): void
     {
         $dom = new Dom();
-        $dom->loadFromFile('tests/data/files/big.html',
-            (new Options())->setPreserveLineBreaks(true));
+        $dom->loadFromFile(
+            'tests/data/files/big.html',
+            (new Options())->setPreserveLineBreaks(true)
+        );
         $post = $dom->find('.post-row', 0);
         $this->assertEquals(
             "<p>Журчанье воды<br />\nЧерно-белые тени<br />\nВновь на фонтане</p>",
@@ -444,12 +446,13 @@ public function testFindAttributeInBothParentAndChild(): void
 
     public function testLessThanCharacterInJavascript(): void
     {
-        $results = (new Dom())->loadStr('<html><head><script type="text/javascript">
+        $results = (new Dom())->loadStr(
+            '<html><head><script type="text/javascript">
             console.log(1 < 3);
         </script></head><body><div id="panel"></div></body></html>',
             (new Options())->setCleanupInput(false)
                 ->setRemoveScripts(false)
-            )->find('body');
+        )->find('body');
         $this->assertCount(1, $results);
     }
 
diff --git a/tests/Node/TextTest.php b/tests/Node/TextTest.php
index dae77b48..2289bcd5 100755
--- a/tests/Node/TextTest.php
+++ b/tests/Node/TextTest.php
@@ -4,7 +4,6 @@
 
 use PHPHtmlParser\Dom;
 use PHPHtmlParser\Dom\Node\TextNode;
-use PHPHtmlParser\Options;
 use PHPUnit\Framework\TestCase;
 use stringEncode\Encode;
 
diff --git a/tests/Options/CleanupTest.php b/tests/Options/CleanupTest.php
index 576541a7..af74ad39 100755
--- a/tests/Options/CleanupTest.php
+++ b/tests/Options/CleanupTest.php
@@ -40,8 +40,10 @@ public function testRemoveStylesFalse(): void
         $dom->setOptions((new Options())->setRemoveStyles(false));
         $dom->loadFromFile('tests/data/files/big.html');
         $this->assertEquals(1, \count($dom->find('style')));
-        $this->assertEquals('text/css',
-            $dom->find('style')->getAttribute('type'));
+        $this->assertEquals(
+            'text/css',
+            $dom->find('style')->getAttribute('type')
+        );
     }
 
     public function testRemoveScriptsTrue(): void
@@ -58,8 +60,10 @@ public function testRemoveScriptsFalse(): void
         $dom->setOptions((new Options())->setRemoveScripts(false));
         $dom->loadFromFile('tests/data/files/big.html');
         $this->assertEquals(22, \count($dom->find('script')));
-        $this->assertEquals('text/javascript',
-            $dom->find('script')->getAttribute('type'));
+        $this->assertEquals(
+            'text/javascript',
+            $dom->find('script')->getAttribute('type')
+        );
     }
 
     public function testSmartyScripts(): void

From f756e8f473716084f3e57349ac8136d2461c5345 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 10 Oct 2022 15:09:37 +0300
Subject: [PATCH 13/15] Include php-cs-fixer in CI.

---
 .github/workflows/ci.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4058be1f..9c426a32 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -40,3 +40,6 @@ jobs:
 
       - name: Run tests
         run: vendor/bin/phpunit
+
+      - name: Run php-cs-fixer
+        run: vendor/bin/php-cs-fixer fix --dry-run -v --diff

From bf66dc20dc9d93e85249a4a7fe21a48b503becb4 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 10 Oct 2022 15:12:55 +0300
Subject: [PATCH 14/15] Updating CONTRIBUTING.

---
 CONTRIBUTING.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index df0ac285..2e805244 100755
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,8 +7,9 @@ This page contains guidelines for contributing to the PHPHtmlParser package. Ple
 We follow the [PSR-4](https://www.php-fig.org/psr/psr-4/) autoloading standard and follow the [PSR-12](https://www.php-fig.org/psr/psr-12/) coding style guide. To make it easy to comply with the coding standard we use php-cs-fixer to manage the style of the code base. Before pushing your code please ensure you run the following on your changes.
 
 ```bash
+./vendor/bin/phpunit
 ./vendor/bin/php-cs-fixer fix
 ```
 
-Please ensure you comply to these standards when creating a PR to make it easy to review and merge. 
+Please ensure you comply to these standards when creating a PR to make it easy to review and merge.
 Thank you.

From 54c47c23ef6803b4ed9a5494ec6b001c41ab48dd Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 10 Oct 2022 16:58:54 +0300
Subject: [PATCH 15/15] Relax the PHP version requirement to allow any version
 from 7.4 up.

---
 CHANGELOG.md  | 5 +++++
 composer.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e62a2b7..e681bdbd 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 4.0.1
+
+### Changed
+- Relaxed the PHP version requirement to allow anything from 7.4 up.
+
 ## 4.0.0
 
 ### Added
diff --git a/composer.json b/composer.json
index b19143a6..14dc7d21 100755
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=7.4.7",
+        "php": ">=7.4",
         "ext-mbstring": "*",
         "ext-zlib": "*",
         "ext-curl": "*",