some more php 8.1 fixes

diff --git a/CHANGELOG b/CHANGELOG
index 00db1ea5c40c0828de2e46964e58f6253cdf5c05..1c929dd30b23ca637b78c71dc6a5c2748d42b57c 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@
        * New field: artists - lookupmultiple field
        * Added setup process. See setup/install.txt for more details
        * Stats info page
-       * Some more PHP 7 syntax
+       * Some more PHP 7/8 syntax and support
 
 1.2 - NyLeve's Falls 20210717
        * Updated requirements information

diff --git a/webclient/lib/gorenest.class.php b/webclient/lib/gorenest.class.php
index 1f34147ae862348a0d60fedf61d5680bb251a0f7..06bbdd91ff56530dd10eb3448186f4f431afa21e 100644 (file)
--- a/webclient/lib/gorenest.class.php
+++ b/webclient/lib/gorenest.class.php
@@ -26,14 +26,14 @@ class GoreNest {
         *
         * @var mysqli
         */
-       private $_DB;
+       private mysqli $_DB;
 
        /**
         * the current loaded user
         *
         * @var Doomguy
         */
-       private $_User;
+       private Doomguy $_User;
 
        /**
         * the already loaded menu information
@@ -41,14 +41,14 @@ class GoreNest {
         *
         * @var array
         */
-       private $_menuData = array();
+       private array $_menuData = array();
 
        /**
         * Array for faster check which call is allowed
         *
         * @var array
         */
-       private $_allowedPageRequests = array();
+       private array $_allowedPageRequests = array();
 
        /**
         * GoreNest constructor.
@@ -66,7 +66,7 @@ class GoreNest {
         *
         * @return void
         */
-       public function loadMenu() {
+       public function loadMenu(): void {
                # reset the menu
                $this->_menuData = array();
 
@@ -98,12 +98,12 @@ class GoreNest {
         * @param bool $reload
         * @return array
         */
-       public function get(string $category, $reload=false): array {
+       public function get(string $category, bool $reload = false): array {
                $ret = array();
 
-               if(empty($category)) return array();
+               if(empty($category)) return $ret;
 
-               if(empty($reload) && isset($this->_menuData[$category])) {
+               if($reload === false && isset($this->_menuData[$category])) {
                        return $this->_menuData[$category];
                }
 

diff --git a/webclient/lib/imdbwebparser.class.php b/webclient/lib/imdbwebparser.class.php
index 524a6c7c63858aa984ab30094631de8693e97d81..94865fbd43663efd18ec86d152b0a43a039f5d9f 100644 (file)
--- a/webclient/lib/imdbwebparser.class.php
+++ b/webclient/lib/imdbwebparser.class.php
@@ -24,27 +24,27 @@ class IMDB
        /**
         * Set this to true if you run into problems.
         */
-       private $IMDB_DEBUG = false;
+       private bool $IMDB_DEBUG = false;
 
        /**
-        * Set the preferred language for the User Agent.
+        * @var string Set the preferred language for the User Agent.
         */
-       private $IMDB_BROWSER_LANG;
+       private string $IMDB_BROWSER_LANG;
 
        /**
         * @var string The accept string for curl call
         */
-       private $IMDB_BROWSER_ACCEPT;
+       private string $IMDB_BROWSER_ACCEPT;
 
        /**
         * @var string The user-agent string fpr curl call
         */
-       private $IMDB_BROWSER_AGENT;
+       private string $IMDB_BROWSER_AGENT;
 
        /**
         * Define the timeout for cURL requests.
         */
-       private $IMDB_TIMEOUT = 15;
+       private int $IMDB_TIMEOUT = 15;
 
        /**
         * These are the regular expressions used to extract the data.
@@ -96,57 +96,57 @@ class IMDB
        /**
         * @var string The string returned, if nothing is found.
         */
-       public $sNotFound = 'n/A';
+       public string $sNotFound = 'n/A';
 
        /**
-        * @var null|int The ID of the movie.
+        * @var string The ID of the movie.
         */
-       public $iId = null;
+       public string $iId = '';
 
        /**
         * @var bool Is the content ready?
         */
-       public $isReady = false;
+       public bool $isReady = false;
 
        /**
         * @var string Char that separates multiple entries.
         */
-       public $sSeparator = ' / ';
+       public string $sSeparator = ' / ';
 
        /**
-        * @var null|string The URL to the movie.
+        * @var string The URL to the movie.
         */
-       public $sUrl = null;
+       public string $sUrl = '';
 
        /**
         * @var bool Return responses enclosed in array
         */
-       public $bArrayOutput = false;
+       public bool $bArrayOutput = false;
 
        /**
         * @var int Maximum cache time.
         */
-       private $iCache = 1440;
+       private int $iCache = 1440;
 
        /**
-        * @var null|string The root of the script.
+        * @var string The root of the script.
         */
-       private $sRoot = null;
+       private string $sRoot = '';
 
        /**
-        * @var null|string Holds the source.
+        * @var string Holds the source.
         */
-       private $sSource = null;
+       private string $sSource = '';
 
        /**
         * @var string What to search for?
         */
-       private $sSearchFor = 'all';
+       private mixed $sSearchFor = 'all';
 
        /**
         * @var array The fields to return at getAll
         */
-       private $_showFields;
+       private array $_showFields;
 
        /**
         * IMDB constructor. Can now set some options
@@ -157,7 +157,7 @@ class IMDB
         *      string storage Where to store data. Absolute path
         *      boolean debug Show debug messages or not
         */
-       public function __construct($options) {
+       public function __construct(array $options) {
 
                if(isset($options['debug']) && !empty($options['debug'])) {
                        $this->IMDB_DEBUG = true;
@@ -197,10 +197,10 @@ class IMDB
 
 
        /**
-        * @param $sSearch
+        * @param string $sSearch
         * @throws Exception
         */
-       public function search($sSearch) {
+       public function search(string $sSearch): void {
 
                $sSearch = trim($sSearch);
                if(empty($sSearch)) {
@@ -229,16 +229,14 @@ class IMDB
         *
         * @return bool True on success, false on failure.
         */
-       private function fetchUrl($sSearch)
-       {
-
+       private function fetchUrl(string $sSearch): bool {
 
                if ($this->IMDB_DEBUG) {
                        echo '<pre><b>Running:</b> fetchUrl("' . $sSearch . '")</pre>';
                }
 
                // Try to find a valid URL.
-               $sId = $this->matchRegex($sSearch, self::IMDB_ID, 1);
+               $sId = $this->matchRegex($sSearch, self::IMDB_ID, "1");
                if (false !== $sId) {
                        $this->iId  = preg_replace('~[\D]~', '', $sId);
                        $this->sUrl = 'https://www.imdb.com/title/tt' . $this->iId . '/reference';
@@ -272,23 +270,25 @@ class IMDB
                                }
                                $sRedirect  = file_get_contents($sRedirectFile);
                                $this->sUrl = trim($sRedirect);
-                               $this->iId  = preg_replace('~[\D]~', '', $this->matchRegex($sRedirect, self::IMDB_ID, 1));
+                               $this->iId  = preg_replace('~[\D]~', '', $this->matchRegex($sRedirect, self::IMDB_ID, "1"));
                                $bSearch    = false;
                        }
                }
 
                // Does a cache of this movie exist?
-               $sCacheFile = $this->sRoot . '/cache/' . sha1($this->iId) . '.cache';
-               if (is_readable($sCacheFile)) {
-                       $iDiff = round(abs(time() - filemtime($sCacheFile)) / 60);
-                       if ($iDiff < $this->iCache) {
-                               if ($this->IMDB_DEBUG) {
-                                       echo '<pre><b>Using cache:</b> ' . basename($sCacheFile) . '</pre>';
-                               }
-                               $this->sSource = file_get_contents($sCacheFile);
-                               $this->isReady = true;
+               if(!empty($this->iId)) {
+                       $sCacheFile = $this->sRoot . '/cache/' . sha1($this->iId) . '.cache';
+                       if (is_readable($sCacheFile)) {
+                               $iDiff = round(abs(time() - filemtime($sCacheFile)) / 60);
+                               if ($iDiff < $this->iCache) {
+                                       if ($this->IMDB_DEBUG) {
+                                               echo '<pre><b>Using cache:</b> ' . basename($sCacheFile) . '</pre>';
+                                       }
+                                       $this->sSource = file_get_contents($sCacheFile);
+                                       $this->isReady = true;
 
-                               return true;
+                                       return true;
+                               }
                        }
                }
 
@@ -309,19 +309,19 @@ class IMDB
                }
 
                // Was the movie found?
-               $sMatch = $this->matchRegex($sSource, self::IMDB_SEARCH, 1);
+               $sMatch = $this->matchRegex($sSource, self::IMDB_SEARCH, "1");
                if (false !== $sMatch) {
                        $sUrl = 'https://www.imdb.com/title/' . $sMatch . '/reference';
                        if ($this->IMDB_DEBUG) {
                                echo '<pre><b>New redirect saved:</b> ' . basename($sRedirectFile) . ' => ' . $sUrl . '</pre>';
                        }
                        file_put_contents($sRedirectFile, $sUrl);
-                       $this->sSource = null;
+                       $this->sSource = '';
                        $this->fetchUrl($sUrl);
 
                        return true;
                }
-               $sMatch = $this->matchRegex($sSource, self::IMDB_NOT_FOUND, 0);
+               $sMatch = $this->matchRegex($sSource, self::IMDB_NOT_FOUND, "0");
                if (false !== $sMatch) {
                        if ($this->IMDB_DEBUG) {
                                echo '<pre><b>Movie not found:</b> ' . $sSearch . '</pre>';
@@ -355,8 +355,7 @@ class IMDB
        /**
         * @return array All data.
         */
-       public function getAll()
-       {
+       public function getAll(): array {
                $aData = [];
                foreach (get_class_methods(__CLASS__) as $method) {
                        if (substr($method, 0, 3) === 'get' && $method !== 'getAll' && $method !== 'getCastImages') {
@@ -375,10 +374,9 @@ class IMDB
        /**
         * @return string “Also Known As” or $sNotFound.
         */
-       public function getAka()
-       {
+       public function getAka(): string {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_AKA, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_AKA, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }
@@ -453,7 +451,7 @@ class IMDB
        public function getAspectRatio()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_ASPECT_RATIO, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_ASPECT_RATIO, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }
@@ -468,7 +466,7 @@ class IMDB
        public function getAwards()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_AWARDS, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_AWARDS, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }
@@ -713,7 +711,7 @@ class IMDB
        public function getCertification()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_CERTIFICATION, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_CERTIFICATION, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }
@@ -728,7 +726,7 @@ class IMDB
        public function getColor()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_COLOR, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_COLOR, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }
@@ -837,7 +835,7 @@ class IMDB
        public function getCreatorAsUrl($sTarget = '')
        {
                if (true === $this->isReady) {
-                       $sMatch  = $this->matchRegex($this->sSource, self::IMDB_CREATOR, 1);
+                       $sMatch  = $this->matchRegex($this->sSource, self::IMDB_CREATOR, "1");
                        $aMatch  = $this->matchRegex($sMatch, self::IMDB_NAME);
                        $aReturn = [];
                        if (count($aMatch[2])) {
@@ -862,7 +860,7 @@ class IMDB
        public function getDescription()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_DESCRIPTION, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_DESCRIPTION, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }
@@ -894,7 +892,7 @@ class IMDB
        public function getDirectorAsUrl($sTarget = '')
        {
                if (true === $this->isReady) {
-                       $sMatch  = $this->matchRegex($this->sSource, self::IMDB_DIRECTOR, 1);
+                       $sMatch  = $this->matchRegex($this->sSource, self::IMDB_DIRECTOR, "1");
                        $aMatch  = $this->matchRegex($sMatch, self::IMDB_NAME);
                        $aReturn = [];
                        if (count($aMatch[2])) {
@@ -960,7 +958,7 @@ class IMDB
        public function getGross()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_GROSS, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_GROSS, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }
@@ -1122,7 +1120,7 @@ class IMDB
        public function getMpaa()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_MPAA, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_MPAA, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }
@@ -1137,7 +1135,7 @@ class IMDB
        public function getPlotKeywords()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_PLOT_KEYWORDS, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_PLOT_KEYWORDS, "1");
                        if (false !== $sMatch) {
                                $aReturn = explode('|', $this->cleanString($sMatch));
 
@@ -1156,7 +1154,7 @@ class IMDB
        public function getPlot($iLimit = 0)
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_PLOT, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_PLOT, "1");
                        if (false !== $sMatch) {
                                if ($iLimit !== 0) {
                                        return $this->shortText($this->cleanString($sMatch), $iLimit);
@@ -1178,7 +1176,7 @@ class IMDB
        public function getPoster($sSize = 'small', $bDownload = false)
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_POSTER, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_POSTER, "1");
                        if (false !== $sMatch) {
                                if ('big' === strtolower($sSize) && false !== strstr($sMatch, '@._')) {
                                        $sMatch = substr($sMatch, 0, strpos($sMatch, '@._')) . '@.jpg';
@@ -1214,7 +1212,7 @@ class IMDB
        public function getRating()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_RATING, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_RATING, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }
@@ -1229,7 +1227,7 @@ class IMDB
        public function getRatingCount()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_RATING_COUNT, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_RATING_COUNT, "1");
                        if (false !== $sMatch) {
                                return str_replace(',', '', $this->cleanString($sMatch));
                        }
@@ -1260,7 +1258,7 @@ class IMDB
        public function getReleaseDate()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_RELEASE_DATE, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_RELEASE_DATE, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }
@@ -1339,7 +1337,7 @@ class IMDB
        public function getRuntime()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_RUNTIME, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_RUNTIME, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }
@@ -1391,7 +1389,7 @@ class IMDB
        public function getSoundMix()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_SOUND_MIX, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_SOUND_MIX, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }
@@ -1406,7 +1404,7 @@ class IMDB
        public function getTagline()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_TAGLINE, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_TAGLINE, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }
@@ -1424,13 +1422,13 @@ class IMDB
        {
                if (true === $this->isReady) {
                        if (true === $bForceLocal) {
-                               $sMatch = $this->matchRegex($this->sSource, self::IMDB_TITLE_ORIG, 1);
+                               $sMatch = $this->matchRegex($this->sSource, self::IMDB_TITLE_ORIG, "1");
                                if (false !== $sMatch && "" !== $sMatch) {
                                        return $this->cleanString($sMatch);
                                }
                        }
 
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_TITLE, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_TITLE, "1");
                        $sMatch = preg_replace('~\(\d{4}\)$~Ui', '', $sMatch);
                        if (false !== $sMatch && "" !== $sMatch) {
                                return $this->cleanString($sMatch);
@@ -1448,7 +1446,7 @@ class IMDB
        public function getTrailerAsUrl($bEmbed = false)
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_TRAILER, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_TRAILER, "1");
                        if (false !== $sMatch) {
                                $sUrl = 'https://www.imdb.com/video/imdb/' . $sMatch . '/' . ($bEmbed ? 'player' : '');
 
@@ -1477,7 +1475,7 @@ class IMDB
        public function getUserReview()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_USER_REVIEW, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_USER_REVIEW, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }
@@ -1492,7 +1490,7 @@ class IMDB
        public function getVotes()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_VOTES, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_VOTES, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }
@@ -1524,7 +1522,7 @@ class IMDB
        public function getWriterAsUrl($sTarget = '')
        {
                if (true === $this->isReady) {
-                       $sMatch  = $this->matchRegex($this->sSource, self::IMDB_WRITER, 1);
+                       $sMatch  = $this->matchRegex($this->sSource, self::IMDB_WRITER, "1");
                        $aMatch  = $this->matchRegex($sMatch, self::IMDB_NAME);
                        $aReturn = [];
                        if (count($aMatch[2])) {
@@ -1549,7 +1547,7 @@ class IMDB
        public function getYear()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_YEAR, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_YEAR, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }
@@ -1564,7 +1562,7 @@ class IMDB
        public function getBudget()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_BUDGET, 1);
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_BUDGET, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }
@@ -1579,23 +1577,22 @@ class IMDB
         *
         * @param string $sContent The content to search in.
         * @param string $sPattern The regular expression.
-        * @param null   $iIndex   The index to return.
+        * @param string $iIndex   The index to return.
         *
         * @return bool   If no match was found.
         * @return string If one match was found.
         * @return array  If more than one match was found.
         */
-       private function matchRegex($sContent, $sPattern, $iIndex = null)
+       private function matchRegex(string $sContent, string $sPattern, string $iIndex = '')
        {
                preg_match_all($sPattern, $sContent, $aMatches);
                if ($aMatches === false) {
                        return false;
                }
-               if ($iIndex !== null && is_int($iIndex)) {
+               if (is_numeric($iIndex)) {
                        if (isset($aMatches[$iIndex][0])) {
                                return $aMatches[$iIndex][0];
                        }
-
                        return false;
                }
 
@@ -1613,10 +1610,10 @@ class IMDB
         *
         * @return string|array Multiple results separated by selected separator string, or enclosed into native array.
         */
-       private function arrayOutput($bArrayOutput, $sSeparator, $sNotFound, $aReturn = null, $bHaveMore = false)
+       private function arrayOutput($bArrayOutput, $sSeparator, $sNotFound, $aReturn = '', $bHaveMore = false)
        {
                if ($bArrayOutput) {
-                       if ($aReturn == null || ! is_array($aReturn)) {
+                       if (empty($aReturn) || ! is_array($aReturn)) {
                                return [];
                        }
 
@@ -1626,7 +1623,7 @@ class IMDB
 
                        return $aReturn;
                } else {
-                       if ($aReturn == null || ! is_array($aReturn)) {
+                       if (empty($aReturn) || ! is_array($aReturn)) {
                                return $sNotFound;
                        }
 

diff --git a/webclient/lib/summoner.class.php b/webclient/lib/summoner.class.php
index 5ca55213cc1bdd6a7b8b2445fdb6cf753cdbaa13..2a75a0246a5b31698a30f136bbaadb0b114085d1 100644 (file)
--- a/webclient/lib/summoner.class.php
+++ b/webclient/lib/summoner.class.php
@@ -27,10 +27,10 @@ class Summoner {
         * @param string $file relative path from THEME/
         * @param string $theme Theme name
         * @param string $defaultTheme Default theme name can be overwritten
-        * @return bool|string False of nothing is found
+        * @return string False of nothing is found
         */
-       static function themefile(string $file, string $theme, $defaultTheme='default') {
-               $ret = false;
+       static function themefile(string $file, string $theme, string $defaultTheme = 'default'): string {
+               $ret = '';
 
                if(file_exists('view/'.$theme.'/'.$file)) {
                        $ret = 'view/'.$theme.'/'.$file;
@@ -48,7 +48,7 @@ class Summoner {
         *
         * @param string $input The string to check
         * @param string $mode How the string should be checked
-        * @param mixed $limit If int given the string is checked for length
+        * @param integer $limit If int given the string is checked for length
         *
         * @return bool
         * @see http://de.php.net/manual/en/regexp.reference.unicode.php
@@ -59,7 +59,7 @@ class Summoner {
         * allowed
         *
         */
-       static function validate(string $input, $mode='text', $limit=false): bool {
+       static function validate(string $input, string $mode = 'text', int $limit = 0): bool {
                // check if we have input
                $input = trim($input);
 
@@ -175,11 +175,11 @@ class Summoner {
         * IMPORTANT: keep the order otherwise the rights will be messed up
         *
         * @param array $rightsArr
-        * @return array
+        * @return string
         */
-       static function prepareRightsString(array $rightsArr): array {
+       static function prepareRightsString(array $rightsArr): string {
                $rsArr = array();
-               $ret = array();
+               $ret = '';
 
                if(!empty($rightsArr)) {
                        // we need a complete type list
@@ -224,7 +224,7 @@ class Summoner {
                        $rString .= $rsArr['other']['read'].$rsArr['other']['write'].$rsArr['other']['delete'];
 
                        if(strlen($rString) != 9) {
-                               $ret = array();
+                               $ret = '';
                                // invalid rights string !!
                        }
                        else {
@@ -279,7 +279,7 @@ class Summoner {
         * @param bool $recursive If we run a recursive scan or not
         * @return array
         */
-       static function readDir(string $directory, $ignore=array(), $recursive=false): array {
+       static function readDir(string $directory, array $ignore = array(), bool $recursive = false): array {
                $files = array();
 
                $dh = opendir($directory);
@@ -314,10 +314,10 @@ class Summoner {
         *
         * @param string $directory
         * @param bool $empty
-        * @param mixed $fTime If not false remove files older then this value in sec.
+        * @param int $fTime If not false remove files older then this value in sec.
         * @return bool
         */
-       static function recursive_remove_directory(string $directory, $empty=false, $fTime=false): bool {
+       static function recursive_remove_directory(string $directory, bool $empty = false, int $fTime = 0): bool {
                // if the path has a slash at the end we remove it here
                if(substr($directory,-1) == '/') {
                        $directory = substr($directory,0,-1);
@@ -449,7 +449,7 @@ class Summoner {
         * @param array|string $key
         * @return bool|mixed
         */
-       static function ifset(array $array, $key) {
+       static function ifset(array $array, array|string $key): mixed {
                if(is_array($key)) {
                        $_t = $array;
                        $_c = 0;