Simplify redundant type checks and tighten false null guards

Author: c15k0

src/DispatcherRuntimeHelper.php

@@ -56,7 +56,7 @@ public static function isSetupRouteAllowed(?string $uri, array $setupAllowedPath
         }
 
         $path = parse_url($uri, PHP_URL_PATH);
-        if (!is_string($path) || '' === $path) {
+        if (null === $path || '' === $path) {
             return false;
         }
 

src/base/Router.php

@@ -258,7 +258,7 @@ public function getRoute($slug = '', $absolute = false, array $params = [])
         if ('' === $slug) {
             return $baseUrl . '/';
         }
-        if (!is_array($this->slugs) || !array_key_exists($slug, $this->slugs)) {
+        if (!array_key_exists($slug, $this->slugs)) {
             throw new RouterException(t('Specified route does not exist'));
         }
         $url = $baseUrl . $this->slugs[$slug];

src/base/Security.php

@@ -165,7 +165,6 @@ private function checkAdminRole($role = AuthHelper::USER_ID_TOKEN)
         $users = $this->getAdmins();
         $logged = $this->getAdmin();
         if (is_array($logged)
-            && is_array($users)
             && array_key_exists('alias', $logged)
             && array_key_exists($logged['alias'], $users)) {
             $security = $users[$logged['alias']]['profile'];
@@ -183,7 +182,6 @@ public function isSuperAdmin()
         $users = $this->getAdmins();
         $logged = $this->getAdmin();
         if (is_array($logged)
-            && is_array($users)
             && array_key_exists('alias', $logged)
             && array_key_exists($logged['alias'], $users)) {
             $security = $users[$logged['alias']]['profile'];

src/base/dto/JsonResponse.php

@@ -51,7 +51,7 @@ public function __construct($data = [], $result = false, $total = null, $pages =
         parent::__construct(false);
         $this->data = $this->parseData($data);
         $this->success = $result;
-        $this->total = $total ?: (is_array($this->data) ? count($this->data) : ($total ?? 0));
+        $this->total = $total ?: (is_countable($this->data) ? count($this->data) : ($total ?? 0));
         $this->pages = $pages;
         if (null !== $message) {
             $this->message = $message;

src/base/extension/TemplateFunctions.php

@@ -243,12 +243,13 @@ private static function extractPathname(string $path, $domains): string|array
     private static function processCssLines($filenamePath): void
     {
         $handle = @fopen($filenamePath, 'r');
-        if ($handle) {
-            while (!feof($handle)) {
-                AssetsParser::extractCssLineResource($handle, $filenamePath);
-            }
-            fclose($handle);
+        if (false === $handle) {
+            return;
+        }
+        while (!feof($handle)) {
+            AssetsParser::extractCssLineResource($handle, $filenamePath);
         }
+        fclose($handle);
     }
 
     /**

src/base/extension/traits/CssTrait.php

@@ -94,18 +94,19 @@ protected function processCssLine($file, $base, $data, $hash)
     protected function loopCssLines($file)
     {
         $handle = @fopen($file, 'r');
-        if ($handle) {
-            while (!feof($handle)) {
-                $line = fgets($handle);
-                $urls = array();
-                if (preg_match_all('#url\((.*?)\)#', $line, $urls, PREG_SET_ORDER)) {
-                    foreach ($urls as $source) {
-                        $this->extractCssResources($source, $file);
-                    }
+        if (false === $handle) {
+            return;
+        }
+        while (!feof($handle)) {
+            $line = fgets($handle);
+            $urls = array();
+            if (preg_match_all('#url\((.*?)\)#', $line, $urls, PREG_SET_ORDER)) {
+                foreach ($urls as $source) {
+                    $this->extractCssResources($source, $file);
                 }
             }
-            fclose($handle);
         }
+        fclose($handle);
     }
 
     /**

src/base/types/CurlService.php

@@ -151,7 +151,7 @@ public function callSrv()
         Logger::log(
             $this->getUrl() . ' response: ',
             LOG_DEBUG,
-            is_array($this->getRawResult()) ? $this->getRawResult() : [$this->getRawResult()]
+            [$this->getRawResult()]
         );
         $this->info = array_merge($this->info, curl_getinfo($this->con));
     }

src/base/types/helpers/AuthHelper.php

@@ -53,7 +53,7 @@ public static function generateProfileHash(?string $role = AuthHelper::SESSION_T
 
     public static function checkBasicAuth(?string $user = null, ?string $pass = null, ?array $admins = []): array
     {
-        $admins = is_array($admins) ? $admins : [];
+        $admins = $admins ?? [];
         [$candidateUser, $candidatePass] = self::resolveBasicCredentials($user, $pass, $admins);
         if (null === $candidateUser || !array_key_exists((string)$candidateUser, $admins)) {
             return self::authTuple();

src/base/types/helpers/I18nHelper.php

@@ -90,10 +90,8 @@ public static function utf8Encode($data): mixed
             }
         } elseif (is_object($data)) {
             $properties = get_class_vars(get_class($data));
-            if (is_array($properties)) {
-                foreach (array_keys($properties) as $property) {
-                    $data->$property = self::utf8Encode($data->$property);
-                }
+            foreach (array_keys($properties) as $property) {
+                $data->$property = self::utf8Encode($data->$property);
             }
         } elseif (is_string($data)) {
             $data = mb_convert_encoding($data, 'UTF-8');

src/base/types/helpers/RequestHelper.php

@@ -80,7 +80,7 @@ public static function normalizeOrigin(?string $origin): ?string
         }
 
         $parsed = parse_url(trim($origin));
-        if (!is_array($parsed) || empty($parsed['scheme']) || empty($parsed['host'])) {
+        if (false === $parsed || empty($parsed['scheme']) || empty($parsed['host'])) {
             return null;
         }