Use null coalesce operator

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Feb 17, 2020 · 327b6ac · 327b6ac
1 parent e860cf9
commit 327b6ac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/Components/IndexHint.php b/src/Components/IndexHint.php
@@ -69,7 +69,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
     {
         $ret = [];
         $expr = new static();
-        $expr->type = isset($options['type']) ? $options['type'] : null;
+        $expr->type = $options['type'] ?? null;
         /**
          * The state of the parser.
          *

diff --git a/src/Utils/Misc.php b/src/Utils/Misc.php
@@ -90,8 +90,7 @@ public static function getAliases($statement, $database)
                 $expr->database : $database;
 
             if (isset($expr->table) && ($expr->table !== '')) {
-                $thisTable = isset($tables[$thisDb][$expr->table]) ?
-                    $tables[$thisDb][$expr->table] : $expr->table;
+                $thisTable = $tables[$thisDb][$expr->table] ?? $expr->table;
                 $retval[$thisDb]['tables'][$thisTable]['columns'][$expr->column] = $expr->alias;
             } else {
                 foreach ($retval[$thisDb]['tables'] as &$table) {

diff --git a/src/Utils/Query.php b/src/Utils/Query.php
@@ -424,7 +424,7 @@ public static function getAll($query)
                 ) {
                     $tableAliases[$expr->alias] = [
                         $expr->table,
-                        isset($expr->database) ? $expr->database : null,
+                        $expr->database ?? null,
                     ];
                 }
             }
@@ -591,7 +591,7 @@ public static function getClause($statement, $list, $clause, $type = 0, $skipFir
          *
          * @var int
          */
-        $clauseIdx = isset($clauses[$clauseType]) ? $clauses[$clauseType] : -1;
+        $clauseIdx = $clauses[$clauseType] ?? -1;
 
         $firstClauseIdx = $clauseIdx;
         $lastClauseIdx = $clauseIdx;