lagdo / jaxon-dbadmin

templates/views/bootstrap3/menu/schemas.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
                 <div class="input-group">
-<?php if(isset($this->schemas) && ($this->schemas)): ?>
+<?php if (isset($this->schemas) && ($this->schemas)): ?>
                     <select class="form-control" id="adminer-schema-select">
-<?php foreach($this->schemas as $schema): ?>
+<?php foreach ($this->schemas as $schema): ?>
                         <option value="<?php echo $schema ?>"><?php echo $schema ?></option>
 <?php endforeach ?>
                     </select>

src/Db/Admin.php

Spacing +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
                     }
                 }
                 if (\preg_match("~ IDENTIFIED BY PASSWORD '([^']+)~", $row[0], $match)) {
-                    $password  = $match[1];
+                    $password = $match[1];
                 }
             }
         }

src/DbAdmin/ViewTrait.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
             $this->viewAdmin = new ViewAdmin();
             $this->viewAdmin->init($this->admin());
         }
-        return $this->viewAdmin ;
+        return $this->viewAdmin;
     }
 
     /**

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';
                         }

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"

src/DbAdmin/TableSelectAdmin.php

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
     {
         return [
             'select' => $select,
-            'values' => (array)$options["columns"],
+            'values' => (array) $options["columns"],
             'columns' => $columns,
             'functions' => $this->driver->functions(),
             'grouping' => $this->driver->grouping(),
@@ -47,7 +47,7 @@ 
         }
         return [
             // 'where' => $where,
-            'values' => (array)$options["where"],
+            'values' => (array) $options["where"],
             'columns' => $columns,
             'indexes' => $indexes,
             'operators' => $this->driver->operators(),
@@ -66,8 +66,8 @@ 
     private function getSortingOptions(array $columns, array $options)
     {
         $values = [];
-        $descs = (array)$options["desc"];
-        foreach ((array)$options["order"] as $key => $value) {
+        $descs = (array) $options["desc"];
+        foreach ((array) $options["order"] as $key => $value) {
             $values[] = [
                 'col' => $value,
                 'desc' => $descs[$key] ?? 0,

src/Db/Util.php

Spacing +6 added lines, -9 removed lines

@@ -80,7 +80,7 @@ 
      */
     public function html(?string $string)
     {
-        if(!$string) {
+        if (!$string) {
             return $string;
         }
         return \str_replace("\0", '�', \htmlspecialchars($string, ENT_QUOTES, 'utf-8'));
@@ -520,9 +520,8 @@ 
         \preg_match_all("~'((?:[^']|'')*)'~", $field->length, $matches);
         foreach ($matches[1] as $i => $val) {
             $val = \stripcslashes(\str_replace("''", "'", $val));
-            $checked = (\is_int($value) ? $value == $i + 1 :
-                (\is_array($value) ? \in_array($i+1, $value) : $value === $val));
-            $inputs[] = "<label><input type='$type'$attrs value='" . ($i+1) . "'" .
+            $checked = (\is_int($value) ? $value == $i + 1 : (\is_array($value) ? \in_array($i + 1, $value) : $value === $val));
+            $inputs[] = "<label><input type='$type'$attrs value='" . ($i + 1) . "'" .
                 ($checked ? ' checked' : '') . '>' . $this->html($this->editValue($val, $field)) . '</label>';
         }
 
@@ -586,8 +585,7 @@ 
         }
         $enumLength = $this->driver->enumLength();
         return (\preg_match("~^\\s*\\(?\\s*$enumLength(?:\\s*,\\s*$enumLength)*+\\s*\\)?\\s*\$~", $length) &&
-            \preg_match_all("~$enumLength~", $length, $matches) ? '(' . \implode(',', $matches[0]) . ')' :
-            \preg_replace('~^[0-9].*~', '(\0)', \preg_replace('~[^-0-9,+()[\]]~', '', $length))
+            \preg_match_all("~$enumLength~", $length, $matches) ? '(' . \implode(',', $matches[0]) . ')' : \preg_replace('~^[0-9].*~', '(\0)', \preg_replace('~[^-0-9,+()[\]]~', '', $length))
         );
     }
 
@@ -769,7 +767,7 @@ 
         $expressions = [];
         foreach ($indexes as $i => $index) {
             if ($index->type == 'FULLTEXT' && $this->input->values['fulltext'][$i] != '') {
-                $columns = \array_map(function ($column) {
+                $columns = \array_map(function($column) {
                     return $this->driver->escapeId($column);
                 }, $index->columns);
                 $expressions[] = 'MATCH (' . \implode(', ', $columns) . ') AGAINST (' .
@@ -884,8 +882,7 @@ 
      */
     private function _selectValue($value, string $link, string $type, string $original)
     {
-        $clause = ($value === null ? '<i>NULL</i>' :
-            (\preg_match('~char|binary|boolean~', $type) && !\preg_match('~var~', $type) ?
+        $clause = ($value === null ? '<i>NULL</i>' : (\preg_match('~char|binary|boolean~', $type) && !\preg_match('~var~', $type) ?
             "<code>$value</code>" : $value));
         if (\preg_match('~blob|bytea|raw|file~', $type) && !$this->isUtf8($value)) {
             $clause = '<i>' . $this->trans->lang('%d byte(s)', \strlen($original)) . '</i>';

src/DbAdmin/CommandAdmin.php

Spacing +4 added lines, -7 removed lines

@@ -208,9 +208,7 @@ 
 
         // 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" ? '|\$[^$]*\$' : '');
         // should always match
         \preg_match('(' . \preg_quote($delimiter) . "\\s*|$parse)", $queries, $match, PREG_OFFSET_CAPTURE, $offset);
@@ -225,8 +223,7 @@ 
             return \intval($pos);
         }
         // find matching quote or comment end
-        while (\preg_match('(' . ($found == '/*' ? '\*/' : ($found == '[' ? ']' :
-            (\preg_match('~^-- |^#~', $found) ? "\n" : \preg_quote($found) . "|\\\\."))) . '|$)s',
+        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];
@@ -323,7 +320,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.
             }
         }
@@ -379,7 +376,7 @@ 
         if ($empty) {
             $messages[] = $this->trans->lang('No commands to execute.');
         } elseif ($onlyErrors) {
-            $messages[] =  $this->trans->lang('%d query(s) executed OK.', $commands - $errors);
+            $messages[] = $this->trans->lang('%d query(s) executed OK.', $commands - $errors);
             // $timestamps[] = $this->trans->formatTime($total_start);
         }
 

src/DbAdmin/TableAdmin.php

Spacing +4 added lines, -5 removed lines

@@ -299,14 +299,14 @@ 
                 $target .= '<b>' . $this->util->html($foreignKey->schema) . '</b>.';
             }
             $target = $this->util->html($foreignKey->table) .
-                '(' . \implode(', ', \array_map(function ($key) {
+                '(' . \implode(', ', \array_map(function($key) {
                     return $this->util->html($key);
                 }, $foreignKey->target)) . ')';
             $details[] = [
                 'name' => $this->util->html($name),
                 'source' => '<i>' . \implode(
                     '</i>, <i>',
-                    \array_map(function ($key) {
+                    \array_map(function($key) {
                         return $this->util->html($key);
                     }, $foreignKey->source)
                 ) . '</i>',
@@ -486,8 +486,7 @@ 
     {
         $foreignKey = $this->foreignKeys[$field->type] ?? null;
         //! Can collide with user defined type
-        $typeField = ($foreignKey === null ? $field :
-            TableFieldEntity::make($this->referencableTables[$foreignKey]));
+        $typeField = ($foreignKey === null ? $field : TableFieldEntity::make($this->referencableTables[$foreignKey]));
         $processedField = $this->util->processField($field, $typeField);
         $origField = $this->fields[$this->fieldName] ?? null;
         if ($this->fieldName === '') {
@@ -569,7 +568,7 @@ 
     private function makeTableAttrs(array $values, string $table = '')
     {
         // From create.inc.php
-        $values['fields'] = (array)$values['fields'];
+        $values['fields'] = (array) $values['fields'];
         if ($values['autoIncrementCol']) {
             $values['fields'][$values['autoIncrementCol']]['autoIncrement'] = true;
         }