Merge pull request #18251 from kamil-tekiela/micro-optimizations-1

MauricioFauth · web-flow · commit b4895064ac85 · 2023-03-14T16:54:41.000-03:00
Micro optimizations 1
diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
@@ -93,8 +93,15 @@ class Config
     /** @var array */
     public array $defaultServer = [];
 
+    private bool $isHttps;
+
     private Settings|null $config = null;
 
+    public function __construct()
+    {
+        $this->isHttps = $this->isHttps();
+    }
+
     /**
      * @param string|null $source source to read config from
      *
@@ -776,8 +783,9 @@ public function checkUploadSize(): void
      */
     public function isHttps(): bool
     {
-        if ($this->get('is_https') !== null) {
-            return (bool) $this->get('is_https');
+        $is_https = $this->get('is_https');
+        if ($is_https !== null) {
+            return (bool) $is_https;
         }
 
         $url = $this->get('PmaAbsoluteUri');
@@ -887,7 +895,7 @@ public function removeCookie(string $cookieName): bool
             time() - 3600,
             $this->getRootPath(),
             '',
-            $this->isHttps(),
+            $this->isHttps,
         );
     }
 
@@ -951,7 +959,7 @@ public function setCookie(
                 'expires' => $validity,
                 'path' => $this->getRootPath(),
                 'domain' => '',
-                'secure' => $this->isHttps(),
+                'secure' => $this->isHttps,
                 'httponly' => $httponly,
                 'samesite' => $cookieSameSite,
             ];
@@ -982,7 +990,7 @@ public function getCookie(string $cookieName): mixed
      */
     public function getCookieName(string $cookieName): string
     {
-        return $cookieName . ( $this->isHttps() ? '_https' : '' );
+        return $cookieName . ( $this->isHttps ? '_https' : '' );
     }
 
     /**
diff --git a/libraries/classes/Config/FormDisplay.php b/libraries/classes/Config/FormDisplay.php
@@ -101,11 +101,14 @@ class FormDisplay
 
     private FormDisplayTemplate $formDisplayTemplate;
 
+    private bool $isSetupScript;
+
     /** @param ConfigFile $cf Config file instance */
     public function __construct(ConfigFile $cf)
     {
         $this->formDisplayTemplate = new FormDisplayTemplate($GLOBALS['config']);
         $this->configFile = $cf;
+        $this->isSetupScript = Sanitize::isSetup();
         // initialize validators
         Validator::getValidators($this->configFile);
     }
@@ -724,7 +727,7 @@ public function getDocLink($path): string
         return MySQLDocumentation::getDocumentationLink(
             'config',
             'cfg_' . $this->getOptName($path),
-            Sanitize::isSetup() ? '../' : './',
+            $this->isSetupScript ? '../' : './',
         );
     }
 
diff --git a/libraries/classes/Url.php b/libraries/classes/Url.php
@@ -228,7 +228,7 @@ public static function getCommonRaw(array $params = [], $divider = '?', $encrypt
 
         $query = self::buildHttpQuery($params, $encrypt);
 
-        if (($divider !== '?' && $divider !== '&') || strlen($query) > 0) {
+        if (($divider !== '?' && $divider !== '&') || $query !== '') {
             return $divider . $query;
         }
 
@@ -241,6 +241,10 @@ public static function getCommonRaw(array $params = [], $divider = '?', $encrypt
      */
     public static function buildHttpQuery($params, $encrypt = true): string
     {
+        if ($params === []) {
+            return '';
+        }
+
         $GLOBALS['config'] ??= null;
 
         $separator = self::getArgSeparator();
@@ -320,7 +324,7 @@ public static function getArgSeparator($encode = 'none'): string
             $arg_separator = (string) ini_get('arg_separator.input');
             if (str_contains($arg_separator, ';')) {
                 $separator = ';';
-            } elseif (strlen($arg_separator) > 0) {
+            } elseif ($arg_separator !== '') {
                 $separator = $arg_separator[0];
             } else {
                 $separator = '&';
