Merge pull request #18631 from kamil-tekiela/Use-null-coalescing-returns

Use null-coalescing returns
phpmyadmin · Aug 17, 2023 · 8279057 · 8279057
2 parents 5b5e444 + 2accd4c
commit 8279057
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 28 deletions.
diff --git a/libraries/classes/Index.php b/libraries/classes/Index.php
@@ -123,11 +123,7 @@ public static function getFromTable(DatabaseInterface $dbi, string $table, strin
     {
         self::loadIndexes($dbi, $table, $schema);
 
-        if (isset(self::$registry[$schema][$table])) {
-            return self::$registry[$schema][$table];
-        }
-
-        return [];
+        return self::$registry[$schema][$table] ?? [];
     }
 
     /**

diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
@@ -929,11 +929,7 @@ public function getGotoInclude(string|false $gotoInclude): string
      */
     public function getErrorUrl(array $urlParams): string
     {
-        if (isset($_POST['err_url'])) {
-            return $_POST['err_url'];
-        }
-
-        return Url::getFromRoute('/table/change', $urlParams);
+        return $_POST['err_url'] ?? Url::getFromRoute('/table/change', $urlParams);
     }
 
     /**

diff --git a/libraries/classes/LanguageManager.php b/libraries/classes/LanguageManager.php
@@ -859,11 +859,8 @@ public function getLanguage(string $code): Language|false
     {
         $code = strtolower($code);
         $langs = $this->availableLanguages();
-        if (isset($langs[$code])) {
-            return $langs[$code];
-        }
 
-        return false;
+        return $langs[$code] ?? false;
     }
 
     /**
@@ -948,13 +945,8 @@ public function selectLanguage(): Language
             }
         }
 
-        // Didn't catch any valid lang : we use the default settings
-        if (isset($langs[$config->get('DefaultLang')])) {
-            return $langs[$config->get('DefaultLang')];
-        }
-
         // Fallback to English
-        return $langs['en'];
+        return $langs[$config->get('DefaultLang')] ?? $langs['en'];
     }
 
     /**

diff --git a/libraries/classes/Navigation/Nodes/NodeDatabase.php b/libraries/classes/Navigation/Nodes/NodeDatabase.php
@@ -72,11 +72,7 @@ public function __construct(string $name, int $type = Node::OBJECT, bool $isGrou
      */
     public function getPresence(string $type = '', string $searchClause = ''): int
     {
-        if (isset($this->presenceCounts[$type][$searchClause])) {
-            return $this->presenceCounts[$type][$searchClause];
-        }
-
-        return $this->presenceCounts[$type][$searchClause] = match ($type) {
+        return $this->presenceCounts[$type][$searchClause] ??= match ($type) {
             'tables' => $this->getTableCount($searchClause),
             'views' => $this->getViewCount($searchClause),
             'procedures' => $this->getProcedureCount($searchClause),

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -6932,7 +6932,7 @@
       <code><![CDATA[$GLOBALS['cfg']['UploadDir']]]></code>
     </InvalidArrayOffset>
     <InvalidReturnStatement>
-      <code><![CDATA[$_POST['err_url']]]></code>
+      <code><![CDATA[$_POST['err_url'] ?? Url::getFromRoute('/table/change', $urlParams)]]></code>
       <code>$formParams</code>
     </InvalidReturnStatement>
     <InvalidReturnType>
@@ -7091,11 +7091,9 @@
     </MixedArgumentTypeCoercion>
     <MixedArrayOffset>
       <code><![CDATA[$langs[$config->get('DefaultLang')]]]></code>
-      <code><![CDATA[$langs[$config->get('DefaultLang')]]]></code>
     </MixedArrayOffset>
     <MixedArrayTypeCoercion>
       <code><![CDATA[$langs[$config->get('DefaultLang')]]]></code>
-      <code><![CDATA[$langs[$config->get('DefaultLang')]]]></code>
     </MixedArrayTypeCoercion>
     <MixedAssignment>
       <code>$lang</code>