Add PHP 8.4 support. Remove PHP 7.* support.

ivopetkov · ivopetkov · commit def94db52e2b · 2025-01-04T23:46:59.000+02:00
diff --git a/autoload.php b/autoload.php
@@ -15,7 +15,7 @@
     'IvoPetkov\HTML5DOMTokenList' => __DIR__ . '/src/HTML5DOMTokenList.php'
 );
 
-spl_autoload_register(function ($class) use ($classes) {
+spl_autoload_register(function ($class) use ($classes): void {
     if (isset($classes[$class])) {
         require $classes[$class];
     }
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "7.0.*|7.1.*|7.2.*|7.3.*|7.4.*|8.0.*|8.1.*|8.2.*|8.3.*",
+        "php": "8.0.*|8.1.*|8.2.*|8.3.*|8.4.*",
         "ext-dom": "*"
     },
     "require-dev": {
diff --git a/src/HTML5DOMDocument.php b/src/HTML5DOMDocument.php
@@ -200,7 +200,7 @@ public function loadHTML($source, $options = 0)
             preg_match_all('/\sid[\s]*=[\s]*(["\'])(.*?)\1/', $source, $matches);
             if (!empty($matches[2]) && max(array_count_values($matches[2])) > 1) {
                 $elementIDs = [];
-                $walkChildren = function ($element) use (&$walkChildren, &$elementIDs) {
+                $walkChildren = function ($element) use (&$walkChildren, &$elementIDs): void {
                     foreach ($element->childNodes as $child) {
                         if ($child instanceof \DOMElement) {
                             if ($child->attributes->length > 0) { // Performance optimization
@@ -301,7 +301,7 @@ private function addBodyElementIfMissing(): bool
      * @param \DOMNode $node Optional parameter to output a subset of the document.
      * @return string The document (or node) HTML code as string.
      */
-    public function saveHTML(\DOMNode $node = null): string
+    public function saveHTML(?\DOMNode $node = null): string
     {
         $nodeMode = $node !== null;
         if ($nodeMode && $node instanceof \DOMDocument) {
@@ -489,7 +489,7 @@ public function insertHTMLMulti(array $sources)
 
         $currentDomDocument = &$this;
 
-        $copyAttributes = function ($sourceNode, $targetNode) {
+        $copyAttributes = function ($sourceNode, $targetNode): void {
             foreach ($sourceNode->attributes as $attributeName => $attribute) {
                 $targetNode->setAttribute($attributeName, $attribute->value);
             }
@@ -500,7 +500,7 @@ public function insertHTMLMulti(array $sources)
         $currentDomBodyElement = null;
 
         $insertTargetsList = null;
-        $prepareInsertTargetsList = function () use (&$insertTargetsList) {
+        $prepareInsertTargetsList = function () use (&$insertTargetsList): void {
             if ($insertTargetsList === null) {
                 $insertTargetsList = [];
                 $targetElements = $this->getElementsByTagName('html5-dom-document-insert-target');
diff --git a/src/HTML5DOMDocument/Internal/QuerySelectors.php b/src/HTML5DOMDocument/Internal/QuerySelectors.php
@@ -44,7 +44,7 @@ private function internalQuerySelectorAll(string $selector, $preferredLimit = nu
             } else {
                 $getChildren = function () use ($context) {
                     $result = [];
-                    $process = function (\DOMNode $node) use (&$process, &$result) {
+                    $process = function (\DOMNode $node) use (&$process, &$result): void {
                         foreach ($node->childNodes as $child) {
                             if ($child instanceof \DOMElement) {
                                 $result[] = $child;
@@ -94,7 +94,7 @@ private function internalQuerySelectorAll(string $selector, $preferredLimit = nu
         $simpleSelectors = [];
 
         // all
-        $simpleSelectors['\*'] = function (string $mode, array $matches, \DOMNode $context, callable $add = null) use ($walkChildren) {
+        $simpleSelectors['\*'] = function (string $mode, array $matches, \DOMNode $context, ?callable $add = null) use ($walkChildren) {
             if ($mode === 'validate') {
                 return true;
             } else {
@@ -107,7 +107,7 @@ private function internalQuerySelectorAll(string $selector, $preferredLimit = nu
         };
 
         // tagname
-        $simpleSelectors['[a-zA-Z0-9\-]+'] = function (string $mode, array $matches, \DOMNode $context, callable $add = null) use ($walkChildren) {
+        $simpleSelectors['[a-zA-Z0-9\-]+'] = function (string $mode, array $matches, \DOMNode $context, ?callable $add = null) use ($walkChildren) {
             $tagNames = [];
             foreach ($matches as $match) {
                 $tagNames[] = strtolower($match[0]);
@@ -123,7 +123,7 @@ private function internalQuerySelectorAll(string $selector, $preferredLimit = nu
         };
 
         // tagname[target] or [target] // Available values for targets: attr, attr="value", attr~="value", attr|="value", attr^="value", attr$="value", attr*="value"
-        $simpleSelectors['(?:[a-zA-Z0-9\-]*)(?:\[.+?\])'] = function (string $mode, array $matches, \DOMNode $context, callable $add = null) use ($walkChildren) {
+        $simpleSelectors['(?:[a-zA-Z0-9\-]*)(?:\[.+?\])'] = function (string $mode, array $matches, \DOMNode $context, ?callable $add = null) use ($walkChildren) {
             $run = function ($match) use ($mode, $context, $add, $walkChildren) {
                 $attributeSelectors = explode('][', substr($match[2], 1, -1));
                 foreach ($attributeSelectors as $i => $attributeSelector) {
@@ -229,7 +229,7 @@ private function internalQuerySelectorAll(string $selector, $preferredLimit = nu
         };
 
         // tagname#id or #id
-        $simpleSelectors['(?:[a-zA-Z0-9\-]*)#(?:[a-zA-Z0-9\-\_]+?)'] = function (string $mode, array $matches, \DOMNode $context, callable $add = null) use ($getElementById) {
+        $simpleSelectors['(?:[a-zA-Z0-9\-]*)#(?:[a-zA-Z0-9\-\_]+?)'] = function (string $mode, array $matches, \DOMNode $context, ?callable $add = null) use ($getElementById) {
             $run = function ($match) use ($mode, $context, $add, $getElementById) {
                 $tagName = strlen($match[1]) > 0 ? strtolower($match[1]) : null;
                 $id = $match[2];
@@ -258,7 +258,7 @@ private function internalQuerySelectorAll(string $selector, $preferredLimit = nu
         };
 
         // tagname.classname, .classname, tagname.classname.classname2, .classname.classname2
-        $simpleSelectors['(?:[a-zA-Z0-9\-]*)\.(?:[a-zA-Z0-9\-\_\.]+?)'] = function (string $mode, array $matches, \DOMNode $context, callable $add = null) use ($walkChildren) {
+        $simpleSelectors['(?:[a-zA-Z0-9\-]*)\.(?:[a-zA-Z0-9\-\_\.]+?)'] = function (string $mode, array $matches, \DOMNode $context, ?callable $add = null) use ($walkChildren) {
             $rawData = []; // Array containing [tag, classnames]
             $tagNames = [];
             foreach ($matches as $match) {
@@ -350,7 +350,7 @@ private function internalQuerySelectorAll(string $selector, $preferredLimit = nu
                         }
                         if (!$found) {
                             $result[] = $element;
-                            if ($preferredLimit !== null && sizeof($result) >= $preferredLimit) {
+                            if ($preferredLimit !== null && count($result) >= $preferredLimit) {
                                 return true;
                             }
                         }
@@ -359,8 +359,8 @@ private function internalQuerySelectorAll(string $selector, $preferredLimit = nu
                 }
 
                 $selectorsToCall = [];
-                $addSelectorToCall = function ($type, $selector, $argument) use (&$selectorsToCall) {
-                    $previousIndex = sizeof($selectorsToCall) - 1;
+                $addSelectorToCall = function ($type, $selector, $argument) use (&$selectorsToCall): void {
+                    $previousIndex = count($selectorsToCall) - 1;
                     // todo optimize complex too
                     if ($type === 1 && isset($selectorsToCall[$previousIndex]) && $selectorsToCall[$previousIndex][0] === $type && $selectorsToCall[$previousIndex][1] === $selector) {
                         $selectorsToCall[$previousIndex][2][] = $argument;
@@ -421,7 +421,7 @@ private function internalQuerySelectorAll(string $selector, $preferredLimit = nu
         };
 
         // div p (space between) - all <p> elements inside <div> elements
-        $complexSelectors[' '] = function (array $parts, \DOMNode $context, callable $add = null) use (&$getMatchingElements) {
+        $complexSelectors[' '] = function (array $parts, \DOMNode $context, ?callable $add = null) use (&$getMatchingElements): void {
             $elements = null;
             foreach ($parts as $part) {
                 if ($elements === null) {
@@ -440,7 +440,7 @@ private function internalQuerySelectorAll(string $selector, $preferredLimit = nu
         };
 
         // div > p - all <p> elements where the parent is a <div> element
-        $complexSelectors['>'] = function (array $parts, \DOMNode $context, callable $add = null) use (&$getMatchingElements, &$isMatchingElement) {
+        $complexSelectors['>'] = function (array $parts, \DOMNode $context, ?callable $add = null) use (&$getMatchingElements, &$isMatchingElement): void {
             $elements = null;
             foreach ($parts as $part) {
                 if ($elements === null) {
@@ -463,7 +463,7 @@ private function internalQuerySelectorAll(string $selector, $preferredLimit = nu
         };
 
         // div + p - all <p> elements that are placed immediately after <div> elements
-        $complexSelectors['+'] = function (array $parts, \DOMNode $context, callable $add = null) use (&$getMatchingElements, &$isMatchingElement) {
+        $complexSelectors['+'] = function (array $parts, \DOMNode $context, ?callable $add = null) use (&$getMatchingElements, &$isMatchingElement): void {
             $elements = null;
             foreach ($parts as $part) {
                 if ($elements === null) {
@@ -484,7 +484,7 @@ private function internalQuerySelectorAll(string $selector, $preferredLimit = nu
         };
 
         // p ~ ul -	all <ul> elements that are preceded by a <p> element
-        $complexSelectors['~'] = function (array $parts, \DOMNode $context, callable $add = null) use (&$getMatchingElements, &$isMatchingElement) {
+        $complexSelectors['~'] = function (array $parts, \DOMNode $context, ?callable $add = null) use (&$getMatchingElements, &$isMatchingElement): void {
             $elements = null;
             foreach ($parts as $part) {
                 if ($elements === null) {
diff --git a/src/HTML5DOMNodeList.php b/src/HTML5DOMNodeList.php
@@ -38,7 +38,7 @@ public function item(int $index)
     public function __get(string $name)
     {
         if ($name === 'length') {
-            return sizeof($this);
+            return count($this);
         }
         throw new \Exception('Undefined property: \IvoPetkov\HTML5DOMNodeList::$' . $name);
     }
diff --git a/src/HTML5DOMTokenList.php b/src/HTML5DOMTokenList.php
@@ -121,7 +121,7 @@ public function item(int $index)
      * @param bool $force A Boolean that, if included, turns the toggle into a one way-only operation. If set to false, the token will only be removed but not added again. If set to true, the token will only be added but not removed again.
      * @return bool false if the token is not in the list after the call, or true if the token is in the list after the call.
      */
-    public function toggle(string $token, bool $force = null): bool
+    public function toggle(string $token, ?bool $force = null): bool
     {
         $this->tokenize();
         $isThereAfter = false;
diff --git a/tests/Test.php b/tests/Test.php
@@ -22,7 +22,7 @@ class Test extends PHPUnit\Framework\TestCase
     public function testSaveHTML()
     {
 
-        $testSource = function ($source, $expectedSource) {
+        $testSource = function ($source, $expectedSource): void {
             $dom = new HTML5DOMDocument();
             $dom->loadHTML($source);
             $this->assertEquals($expectedSource, $this->removeNewLines($dom->saveHTML()));
@@ -50,7 +50,7 @@ public function testSaveHTML()
      */
     public function testOmitedElements()
     {
-        $testSource = function ($source, $expectedSource) {
+        $testSource = function ($source, $expectedSource): void {
             $dom = new HTML5DOMDocument();
             $dom->loadHTML($source);
             $this->assertEquals($expectedSource, $this->removeNewLines($dom->saveHTML()));
@@ -312,7 +312,7 @@ public function testInsertHTML()
     public function testEmpty()
     {
 
-        $testSource = function ($source, $expectedSource) {
+        $testSource = function ($source, $expectedSource): void {
             $dom = new HTML5DOMDocument();
             $dom->loadHTML($source);
             $this->assertEquals($expectedSource, $this->removeNewLines($dom->saveHTML()));
@@ -631,7 +631,7 @@ public function testGetAttributes()
         $this->assertTrue($dom->querySelector('div')->getAttribute('unknown') === '');
         $this->assertTrue($dom->querySelector('div')->getAttribute('data-value') === $expectedDataAttributeValue);
         $attributes = $dom->querySelector('div')->getAttributes();
-        $this->assertTrue(sizeof($attributes) === 2);
+        $this->assertTrue(count($attributes) === 2);
         $this->assertTrue($attributes['class'] === 'text1');
     }
 
@@ -1295,12 +1295,12 @@ public function testLIBXML_HTML_NOIMPLIED()
     public function testCompatibilityWithDOMDocument()
     {
 
-        $compareDOMs = function (HTML5DOMDocument $dom1, DOMDocument $dom2) {
+        $compareDOMs = function (HTML5DOMDocument $dom1, DOMDocument $dom2): void {
             $this->assertEquals($dom1->getElementsByTagName('html')->length, $dom2->getElementsByTagName('html')->length);
             $this->assertEquals($dom1->getElementsByTagName('head')->length, $dom2->getElementsByTagName('head')->length);
             $this->assertEquals($dom1->getElementsByTagName('body')->length, $dom2->getElementsByTagName('body')->length);
 
-            $updateNewLines = function (&$content) {
+            $updateNewLines = function (&$content): void {
                 $content = str_replace("\n<head>", '<head>', $content);
                 $content = str_replace("\n<body>", '<body>', $content);
                 $content = str_replace("\n</html>", '</html>', $content);
@@ -1335,7 +1335,7 @@ public function testCompatibilityWithDOMDocument()
             }
         };
 
-        $compareContent = function ($content) use ($compareDOMs) {
+        $compareContent = function ($content) use ($compareDOMs): void {
             $dom = new HTML5DOMDocument();
             $dom->loadHTML($content);
             $dom2 = new DOMDocument();

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`'IvoPetkov\HTML5DOMTokenList' => __DIR__ . '/src/HTML5DOMTokenList.php'`
`16`	`16`	`);`
`17`	`17`
`18`		`-spl_autoload_register(function ($class) use ($classes) {`
	`18`	`+spl_autoload_register(function ($class) use ($classes): void {`
`19`	`19`	`if (isset($classes[$class])) {`
`20`	`20`	`require $classes[$class];`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`],`
`12`	`12`	`"require": {`
`13`		`- "php": "7.0.\|7.1.\|7.2.\|7.3.\|7.4.\|8.0.\|8.1.\|8.2.\|8.3.*",`
	`13`	`+ "php": "8.0.\|8.1.\|8.2.\|8.3.\|8.4.*",`
`14`	`14`	`"ext-dom": "*"`
`15`	`15`	`},`
`16`	`16`	`"require-dev": {`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function item(int $index)`
`38`	`38`	`public function __get(string $name)`
`39`	`39`	`{`
`40`	`40`	`if ($name === 'length') {`
`41`		`- return sizeof($this);`
	`41`	`+ return count($this);`
`42`	`42`	`}`
`43`	`43`	`throw new \Exception('Undefined property: \IvoPetkov\HTML5DOMNodeList::$' . $name);`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public function item(int $index)`
`121`	`121`	`* @param bool $force A Boolean that, if included, turns the toggle into a one way-only operation. If set to false, the token will only be removed but not added again. If set to true, the token will only be added but not removed again.`
`122`	`122`	`* @return bool false if the token is not in the list after the call, or true if the token is in the list after the call.`
`123`	`123`	`*/`
`124`		`- public function toggle(string $token, bool $force = null): bool`
	`124`	`+ public function toggle(string $token, ?bool $force = null): bool`
`125`	`125`	`{`
`126`	`126`	`$this->tokenize();`
`127`	`127`	`$isThereAfter = false;`