Merge pull request #265 from claudiu-cristea/deprecated-passing-empty-ord

Passing empty to ord() is deprecated in PHP 8.5

Author: goetas

.github/workflows/ci.yaml

@@ -23,6 +23,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
 
     steps:
       - name: Checkout code

composer.json

@@ -24,7 +24,7 @@
         "php" : ">=5.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit" : "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8 || ^9"
+        "phpunit/phpunit" : "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8 || ^9 || ^10"
     },
     "autoload": {
         "psr-4": {"Masterminds\\": "src"}

phpunit.xml.dist

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true" bootstrap="vendor/autoload.php">
+<phpunit
+    colors="true"
+    bootstrap="vendor/autoload.php"
+    failOnDeprecation="true"
+    displayDetailsOnTestsThatTriggerDeprecations="true"
+>
     <testsuites>
         <testsuite name="PHPUnit">
           <directory>test/HTML5/</directory>

src/HTML5/Parser/Tokenizer.php

@@ -1208,6 +1208,10 @@ protected function decodeCharacterReference($inAttribute = false)
      */
     protected function is_alpha($input)
     {
+        if (!is_string($input) || 1 !== strlen($input)) {
+            return false;
+        }
+
         $code = ord($input);
 
         return ($code >= 97 && $code <= 122) || ($code >= 65 && $code <= 90);

test/HTML5/Html5Test.php

@@ -560,4 +560,12 @@ public function testAnchorTargetQueryParam()
             $this->assertContains('<a href="https://domain.com/page.php?foo=bar&amp;target=baz">https://domain.com/page.php?foo=bar&amp;target=baz</a>', $res);
         }
     }
+
+    public function testEndsWithSlash()
+    {
+        $html = '<p>Visit <a href="http://example.com/">example.com</';
+        $expected = '<p>Visit <a href="http://example.com/">example.com</a></p>';
+        $doc =  $this->html5->loadHTMLFragment($html);
+        $this->assertSame($expected, $this->html5->saveHTML($doc));
+    }
 }