Fix some PHP8.1 issues if possible

diff --git a/src/App/Page.php b/src/App/Page.php
index a6f46bdd853c5e61eb88b4494b0149263541bc41..0f14d9f6e6530106ecbb87b0bd922a894ddcf4e8 100644 (file)
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -130,7 +130,7 @@ class Page implements ArrayAccess
         * The return value will be casted to boolean if non-boolean was returned.
         * @since 5.0.0
         */
-       public function offsetExists($offset)
+       public function offsetExists($offset): bool
        {
                return isset($this->page[$offset]);
        }

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 0f879c494848ae6c73239b9b922dd8e194dfaea9..a74f18fa6bd45ae48827c44e91e2e4bc67d14b3c 100644 (file)
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -188,10 +188,10 @@ class L10n
        {
                $lang_variable = $server['HTTP_ACCEPT_LANGUAGE'] ?? null;
 
-               $acceptedLanguages = preg_split('/,\s*/', $lang_variable);
-
-               if (empty($acceptedLanguages)) {
+               if (empty($lang_variable)) {
                        $acceptedLanguages = [];
+               } else {
+                       $acceptedLanguages = preg_split('/,\s*/', $lang_variable);
                }
 
                // Add get as absolute quality accepted language (except this language isn't valid)

diff --git a/src/Util/Network.php b/src/Util/Network.php
index 508934db2c6eb0ccb89ed799c34eb7f6010932d3..5a06a0056e5065bd890e10c1cc5e9a59af97141c 100644 (file)
--- a/src/Util/Network.php
+++ b/src/Util/Network.php
@@ -485,11 +485,11 @@ class Network
                                                $get('host') .
                                                ($port ? ":$port" : '');
 
-               return  (strlen($scheme) ? $scheme . ':' : '') .
-                       (strlen($authority) ? '//' . $authority : '') .
+               return  (!empty($scheme) ? $scheme . ':' : '') .
+                       (!empty($authority) ? '//' . $authority : '') .
                        $get('path') .
-                       (strlen($query) ? '?' . $query : '') .
-                       (strlen($fragment) ? '#' . $fragment : '');
+                       (!empty($query) ? '?' . $query : '') .
+                       (!empty($fragment) ? '#' . $fragment : '');
        }
 
        /**

diff --git a/src/Util/ReversedFileReader.php b/src/Util/ReversedFileReader.php
index cda78ad0abb0b76037f6cfccf22eb308de262ef5..2ef062152c9e590203c23ad499b009f60c82335d 100644 (file)
--- a/src/Util/ReversedFileReader.php
+++ b/src/Util/ReversedFileReader.php
@@ -60,7 +60,7 @@ class ReversedFileReader implements \Iterator
                $this->fh = fopen($filename, 'r');
                if (!$this->fh) {
                        // this should use a custom exception.
-                       throw \Exception("Unable to open $filename");
+                       throw new \Exception("Unable to open $filename");
                }
                $this->filesize = filesize($filename);
                $this->pos      = -1;