lagdo / jaxon-dbadmin

src/DbAdmin/CommandAdmin.php

Spacing +5 added lines, -9 removed lines

@@ -96,8 +96,7 @@ 
         if ($rowCount > 0) {
             $numRows = $statement->rowCount();
             $message = ($numRows ? ($limit && $numRows > $limit ?
-                $this->trans->lang('%d / ', $limit) :
-                "") . $this->trans->lang('%d row(s)', $numRows) : "");
+                $this->trans->lang('%d / ', $limit) : "") . $this->trans->lang('%d row(s)', $numRows) : "");
         }
 
         // Table header
@@ -158,7 +157,7 @@ 
                 \ini_set("memory_limit", \max($this->util->iniBytes("memory_limit"),
                     2 * \strlen($queries) + \memory_get_usage() + 8e6));
             }
-            catch(\Exception $e) {
+            catch (\Exception $e) {
                 // Do nothing if the option is not modified.
             }
         }
@@ -182,9 +181,7 @@ 
         $timestamps = [];
         // TODO: Move this to driver implementations
         $parse = '[\'"' .
-            ($this->driver->jush() == "sql" ? '`#' :
-            ($this->driver->jush() == "sqlite" ? '`[' :
-            ($this->driver->jush() == "mssql" ? '[' : ''))) . ']|/\*|-- |$' .
+            ($this->driver->jush() == "sql" ? '`#' : ($this->driver->jush() == "sqlite" ? '`[' : ($this->driver->jush() == "mssql" ? '[' : ''))) . ']|/\*|-- |$' .
             ($this->driver->jush() == "pgsql" ? '|\$[^$]*\$' : '');
         // $total_start = \microtime(true);
         // \parse_str($_COOKIE["adminer_export"], $adminer_export);
@@ -211,8 +208,7 @@ 
 
             if ($found && \rtrim($found) != $delimiter) {
                 // find matching quote or comment end
-                while (\preg_match('(' . ($found == '/*' ? '\*/' : ($found == '[' ? ']' :
-                    (\preg_match('~^-- |^#~', $found) ? "\n" : \preg_quote($found) .
+                while (\preg_match('(' . ($found == '/*' ? '\*/' : ($found == '[' ? ']' : (\preg_match('~^-- |^#~', $found) ? "\n" : \preg_quote($found) .
                     "|\\\\."))) . '|$)s', $queries, $match, PREG_OFFSET_CAPTURE, $offset)) {
                     //! respect sql_mode NO_BACKSLASH_ESCAPES
                     $s = $match[0][0];
@@ -306,7 +302,7 @@ 
         if ($empty) {
             $messages[] = $this->trans->lang('No commands to execute.');
         } elseif ($onlyErrors) {
-            $messages[] =  $this->trans->lang('%d query(s) executed OK.', $commands - \count($errors));
+            $messages[] = $this->trans->lang('%d query(s) executed OK.', $commands - \count($errors));
             // $timestamps[] = $this->trans->formatTime($total_start);
         }
         // elseif($errors && $commands > 1)

Braces +1 added lines, -2 removed lines

@@ -157,8 +157,7 @@
             try {
                 \ini_set("memory_limit", \max($this->util->iniBytes("memory_limit"),
                     2 * \strlen($queries) + \memory_get_usage() + 8e6));
-            }
-            catch(\Exception $e) {
+            } catch(\Exception $e) {
                 // Do nothing if the option is not modified.
             }
         }

src/DbAdmin/ExportAdmin.php

Spacing +2 added lines, -3 removed lines

@@ -239,8 +239,7 @@ 
                 $row[$key] = '"' . \str_replace('"', '""', $val) . '"';
             }
         }
-        $separator = $this->options['format'] == 'csv' ? ',' :
-            ($this->options['format'] == 'tsv' ? "\t" : ';');
+        $separator = $this->options['format'] == 'csv' ? ',' : ($this->options['format'] == 'tsv' ? "\t" : ';');
         $this->queries[] = \implode($separator, $row);
     }
 
@@ -354,7 +353,7 @@ 
                     } else {
                         if (!$insert) {
                             $insert = 'INSERT INTO ' . $this->driver->table($table) . ' (' .
-                                \implode(', ', \array_map(function ($key) {
+                                \implode(', ', \array_map(function($key) {
                                     return $this->driver->escapeId($key);
                                 }, $keys)) . ') VALUES';
                         }

Braces +1 added lines, -2 removed lines

@@ -526,8 +526,7 @@
                 }
 
                 $this->dumpTablesAndViews($database);
-            }
-            catch (\Exception $e) {
+            } catch (\Exception $e) {
                 return $e->getMessage();
             }
         }

src/DbAdmin/TableQueryAdmin.php

Spacing +3 added lines, -5 removed lines

@@ -101,8 +101,7 @@ 
             $maxlength = (!\preg_match('~int~', $field->type) &&
                 \preg_match('~^(\d+)(,(\d+))?$~', $field->length, $match) ?
                 ((\preg_match("~binary~", $field->type) ? 2 : 1) * $match[1] + (($match[3] ?? null) ? 1 : 0) +
-                (($match[2] ?? false) && !$unsigned ? 1 : 0)) :
-                ($this->driver->typeExists($field->type) ? $this->driver->type($field->type) + ($unsigned ? 0 : 1) : 0));
+                (($match[2] ?? false) && !$unsigned ? 1 : 0)) : ($this->driver->typeExists($field->type) ? $this->driver->type($field->type) + ($unsigned ? 0 : 1) : 0));
             if ($this->driver->jush() == 'sql' && $this->driver->minVersion(5.6) && \preg_match('~time~', $field->type)) {
                 $maxlength += 7; // microtime
             }
@@ -243,8 +242,7 @@ 
                 $value = (
                     $row !== null ? (
                         $row[$name] != "" && $this->driver->jush() == "sql" && \preg_match("~enum|set~", $field->type) ?
-                        (\is_array($row[$name]) ? \array_sum($row[$name]) : +$row[$name]) :
-                        (\is_bool($row[$name]) ? +$row[$name] : $row[$name])
+                        (\is_array($row[$name]) ? \array_sum($row[$name]) : +$row[$name]) : (\is_bool($row[$name]) ? +$row[$name] : $row[$name])
                     ) : (
                         !$update && $field->autoIncrement ? "" : (isset($queryOptions["select"]) ? false : $default)
                     )
@@ -254,7 +252,7 @@ 
                 }
                 $function = (
                     $queryOptions["save"]
-                    ? (string)$queryOptions["function"][$name]
+                    ? (string) $queryOptions["function"][$name]
                     : (
                         $update && \preg_match('~^CURRENT_TIMESTAMP~i', $field->onUpdate)
                         ? "now"