lagdo / jaxon-dbadmin

src/Package.php

Spacing +2 added lines, -2 removed lines

@@ -201,7 +201,7 @@ 
     {
         $servers = $this->getConfig()->getOption('servers', []);
         $default = $this->getConfig()->getOption('default', '');
-        if(array_key_exists($default, $servers))
+        if (array_key_exists($default, $servers))
         {
             return $default;
         }
@@ -256,7 +256,7 @@ 
      */
     public function getReadyScript()
     {
-        if(!($server = $this->getDefaultServer()))
+        if (!($server = $this->getDefaultServer()))
         {
             return '';
         }

src/Db/Util.php

Spacing +5 added lines, -8 removed lines

@@ -449,9 +449,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($val) . '</label>';
         }
 
@@ -515,8 +514,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))
         );
     }
 
@@ -703,7 +701,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 (' .
@@ -818,8 +816,7 @@ 
      */
     private function _selectValue($value, string $link, string $type, $original): string
     {
-        $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>';

Braces +1 added lines, -2 removed lines

@@ -858,8 +858,7 @@
         if ($link === '') {
             if ($this->isMail($value)) {
                 $link = "mailto:$value";
-            }
-            elseif ($this->isUrl($value)) {
+            } elseif ($this->isUrl($value)) {
                 $link = $value; // IE 11 and all modern browsers hide referrer
             }
         }

src/DbAdmin/Traits/TableSelectTrait.php

Indentation +1 added lines, -1 removed lines

@@ -261,7 +261,7 @@
      * @return TableSelectEntity
      */
     private function getSelectEntity(string $table, array $columns, array $fields, array $select,
-                                     array $group, array $where, array $order, array $unselected, int $limit, int $page): TableSelectEntity
+                                        array $group, array $where, array $order, array $unselected, int $limit, int $page): TableSelectEntity
     {
         $select2 = $select;
         $group2 = $group;

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
     {
         return [
             'select' => $select,
-            'values' => (array)$options["columns"],
+            'values' => (array) $options["columns"],
             'columns' => $columns,
             'functions' => $this->driver->functions(),
             'grouping' => $this->driver->grouping(),
@@ -49,7 +49,7 @@ 
         }
         return [
             // 'where' => $where,
-            'values' => (array)$options["where"],
+            'values' => (array) $options["where"],
             'columns' => $columns,
             'indexes' => $indexes,
             'operators' => $this->driver->operators(),
@@ -68,8 +68,8 @@ 
     private function getSortingOptions(array $columns, array $options): array
     {
         $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/DbAdmin/TableSelectAdmin.php

Spacing +2 added lines, -2 removed lines

@@ -329,8 +329,8 @@
      */
     public function execSelect(string $table, array $queryOptions): array
     {
-        list(, $query, $select, $fields, , , $indexes, $where, $group, , $limit, $page,
-            $textLength, , $unselected) = $this->prepareSelect($table, $queryOptions);
+        list(, $query, $select, $fields,,, $indexes, $where, $group,, $limit, $page,
+            $textLength,, $unselected) = $this->prepareSelect($table, $queryOptions);
 
         list($rows, $duration) = $this->executeQuery($query, $page);
         if (!$rows) {

src/DbAdmin/TableAdmin.php

Spacing +3 added lines, -3 removed lines

@@ -218,14 +218,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>',
@@ -369,7 +369,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;
         }

src/DbAdmin/Traits/TableTrait.php

Spacing +1 added lines, -2 removed lines

@@ -141,8 +141,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 === '') {

src/DbAdmin/TableQueryAdmin.php

Spacing +3 added lines, -8 removed lines

@@ -97,8 +97,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
         }
@@ -333,12 +332,8 @@ 
                 // }
                 $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])) :
-                    (!$update && $field->autoIncrement ? "" : (isset($queryOptions["select"]) ? false : $default)));
-                $function = ($queryOptions["save"] ? (string)$queryOptions["function"][$name] :
-                    ($update && preg_match('~^CURRENT_TIMESTAMP~i', $field->onUpdate) ? "now" :
-                    ($value === false ? null : ($value !== null ? '' : 'NULL'))));
+                    (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)));
+                $function = ($queryOptions["save"] ? (string) $queryOptions["function"][$name] : ($update && preg_match('~^CURRENT_TIMESTAMP~i', $field->onUpdate) ? "now" : ($value === false ? null : ($value !== null ? '' : 'NULL'))));
                 if (!$update && $value == $field->default && preg_match('~^[\w.]+\(~', $value)) {
                     $function = "SQL";
                 }