Upgrading a minimum PHP version to 8.1

composer.json

@@ -12,14 +12,14 @@
         }
     ],
 	"require":{
-        "php":">=5.6",
+        "php":">=8.1",
         "ext-dom": "*",
         "ext-libxml": "*",
         "ext-simplexml": "*",
-        "symfony/css-selector": "*"
+        "symfony/css-selector": "^6.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
+        "phpunit/phpunit": "^10.0.0",
         "php-coveralls/php-coveralls": "^2.2"
     },
     "autoload": {

lib/Document.php

@@ -29,12 +29,12 @@ class Document
     /**
      * @var DOMDocument
      */
-    protected $document;
+    protected DOMDocument $document;
 
     /**
      * @var array
      */
-    protected $functionAliases = [
+    protected array $functionAliases = [
         'outertext' => 'html',
         'innertext' => 'innerHtml',
         'load'      => 'loadHtml',
@@ -52,7 +52,7 @@ class Document
      *
      * @param string|Element $element HTML code or Element
      */
-    public function __construct($element = null)
+    public function __construct(mixed $element = null)
     {
         $this->document = new DOMDocument('1.0', 'UTF-8');
 
@@ -78,7 +78,7 @@ public function __construct($element = null)
      * @return Document
      * @throws InvalidArgumentException if argument is not string
      */
-    public function loadHtml($html)
+    public function loadHtml(mixed $html): static
     {
         if (!is_string($html)) {
             throw new InvalidArgumentException(__METHOD__ . ' expects parameter 1 to be string.');
@@ -108,7 +108,7 @@ public function loadHtml($html)
      * @throws InvalidArgumentException
      * @throws RuntimeException
      */
-    public function loadHtmlFile($filePath)
+    public function loadHtmlFile(mixed $filePath): static
     {
         if (!is_string($filePath)) {
             throw new InvalidArgumentException(__METHOD__ . ' expects parameter 1 to be string.');
@@ -118,15 +118,9 @@ public function loadHtmlFile($filePath)
             throw new RuntimeException("File $filePath not found");
         }
 
-        try {
-            $html = file_get_contents($filePath);
-        } catch (\Exception $e) {
-            throw new RuntimeException("Could not load file $filePath");
-        }
-
-        if ($html === false) {
-            throw new RuntimeException("Could not load file $filePath");
-        }
+				if (($html = @file_get_contents($filePath)) === false) {
+					throw new RuntimeException("Could not load file $filePath");
+				}
 
         $this->loadHtml($html);
 
@@ -136,7 +130,7 @@ public function loadHtmlFile($filePath)
     /**
      * @return DOMDocument
      */
-    public function getDocument()
+    public function getDocument(): DOMDocument
     {
         return $this->document;
     }
@@ -145,11 +139,11 @@ public function getDocument()
      * Find list of nodes with a CSS selector
      *
      * @param string $selector
-     * @param int    $idx
+     * @param int|null $idx
      *
      * @return NodeList|Element|null
      */
-    public function find($selector, $idx = null)
+    public function find(mixed $selector, int $idx = null): NodeList|Element|null
     {
         $xPathQuery = SelectorConverter::toXPath($selector);
 
@@ -177,7 +171,7 @@ public function find($selector, $idx = null)
      *
      * @return string
      */
-    public function html()
+    public function html(): string
     {
         if ($this::$callback !== null) {
             call_user_func($this::$callback, $this);
@@ -191,7 +185,7 @@ public function html()
      *
      * @return string
      */
-    public function innerHtml()
+    public function innerHtml(): string
     {
         $text = '';
         foreach ($this->document->documentElement->childNodes as $node) {
@@ -206,7 +200,7 @@ public function innerHtml()
      *
      * @return string
      */
-    public function text()
+    public function text(): string
     {
         return $this->document->textContent;
     }
@@ -218,7 +212,7 @@ public function text()
      *
      * @return string
      */
-    public function save($filepath = '')
+    public function save(string $filepath = ''): string
     {
         $string = $this->innerHtml();
         if ($filepath !== '') {
@@ -231,7 +225,7 @@ public function save($filepath = '')
     /**
      * @param $functionName
      */
-    public function set_callback($functionName)
+    public function set_callback($functionName): void
     {
         $this::$callback = $functionName;
     }
@@ -247,20 +241,17 @@ public function clear()
      */
     public function __get($name)
     {
-        switch ($name) {
-            case 'outertext':
-                return $this->html();
-            case 'innertext':
-                return $this->innerHtml();
-            case 'plaintext':
-                return $this->text();
-        }
+	    return match ($name) {
+		    'outertext' => $this->html(),
+		    'innertext' => $this->innerHtml(),
+		    'plaintext' => $this->text(),
+		    default => null,
+	    };
 
-        return null;
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function __toString()
     {
@@ -269,11 +260,11 @@ public function __toString()
 
     /**
      * @param string $selector
-     * @param int    $idx
+     * @param int|null $idx
      *
      * @return Element|NodeList|null
      */
-    public function __invoke($selector, $idx = null)
+    public function __invoke(string $selector, int $idx = null): NodeList|Element|null
     {
         return $this->find($selector, $idx);
     }
@@ -298,7 +289,7 @@ public function __call($name, $arguments)
      * @param $name
      * @param $arguments
      *
-     * @return bool|Document
+     * @return Document
      *
      * @throws BadMethodCallException
      */