lagdo / jaxon-dbadmin

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 === '') {

templates/views/bootstrap4/table/query.php

Spacing +5 added lines, -5 removed lines

@@ -1,16 +1,16 @@
 <form id="<?php echo $this->formId ?>">
-<?php foreach($this->fields as $name => $field): ?>
+<?php foreach ($this->fields as $name => $field): ?>
         <div class="form-group row">
             <div class="col-md-3">
                 <label title="<?php echo $field['type'] ?>"><?php echo $field['name'] ?></label>
             </div>
             <div class="col-md-2">
-<?php if($field['functions']['type'] === 'name'): ?>
+<?php if ($field['functions']['type'] === 'name'): ?>
                 <label class=""><?php echo $field['functions']['name'] ?></label>
-<?php elseif($field['functions']['type'] === 'select'): ?>
+<?php elseif ($field['functions']['type'] === 'select'): ?>
                 <select name="<?php echo $field['functions']['name'] ?>" class="form-control">
-<?php foreach($field['functions']['options'] as $function): ?>
-                    <option <?php if($function === $field['functions']['selected']): ?>selected<?php
+<?php foreach ($field['functions']['options'] as $function): ?>
+                    <option <?php if ($function === $field['functions']['selected']): ?>selected<?php
                         endif ?>><?php echo $function ?></option>
 <?php endforeach ?>
                 </select>

templates/views/bootstrap3/table/query.php

Spacing +5 added lines, -5 removed lines

@@ -1,16 +1,16 @@
 <form class="form-horizontal" role="form" id="<?php echo $this->formId ?>">
-<?php foreach($this->fields as $name => $field): ?>
+<?php foreach ($this->fields as $name => $field): ?>
         <div class="form-group">
             <div class="col-md-3">
                 <label title="<?php echo $field['type'] ?>"><?php echo $field['name'] ?></label>
             </div>
             <div class="col-md-2">
-<?php if($field['functions']['type'] === 'name'): ?>
+<?php if ($field['functions']['type'] === 'name'): ?>
                 <label class=""><?php echo $field['functions']['name'] ?></label>
-<?php elseif($field['functions']['type'] === 'select'): ?>
+<?php elseif ($field['functions']['type'] === 'select'): ?>
                 <select name="<?php echo $field['functions']['name'] ?>" class="form-control">
-<?php foreach($field['functions']['options'] as $function): ?>
-                    <option <?php if($function === $field['functions']['selected']): ?>selected<?php
+<?php foreach ($field['functions']['options'] as $function): ?>
+                    <option <?php if ($function === $field['functions']['selected']): ?>selected<?php
                         endif ?>><?php echo $function ?></option>
 <?php endforeach ?>
                 </select>

src/DbAdmin/Traits/QueryInputTrait.php

Spacing +2 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
                 'text' => '<i>' . $this->trans->lang('original') . '</i>'];
         }
         if ($field->null) {
-            $values[] =  ['value' => '', 'checked' => $value === null && !$select, 'text' => '<i>NULL</i>'];
+            $values[] = ['value' => '', 'checked' => $value === null && !$select, 'text' => '<i>NULL</i>'];
         }
 
         // From functions.inc.php (function enum_input())
@@ -80,8 +80,7 @@ 
         preg_match_all("~'((?:[^']|'')*)'~", $field->fullType, $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));
+            $checked = (is_int($value) ? $value == $i + 1 : (is_array($value) ? in_array($i + 1, $value) : $value === $val));
             $values[] = ['value' => $i + 1, 'checked' => $checked, 'text' => $this->util->html($val)];
         }
 

src/Db/Util.php

Spacing +3 added lines, -5 removed lines

@@ -419,8 +419,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))
         );
     }
 
@@ -607,7 +606,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 (' .
@@ -722,8 +721,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>';

src/DbAdmin/Traits/TableQueryTrait.php

Spacing +2 added lines, -2 removed lines

@@ -121,7 +121,7 @@ 
         if ($row === null) {
             return !$update && $field->autoIncrement ? "" : (isset($queryOptions["select"]) ? false : $default);
         }
-        if ($row[$name] != "" && $this->driver->jush() == "sql" && preg_match("~enum|set~", $field->type) ) {
+        if ($row[$name] != "" && $this->driver->jush() == "sql" && preg_match("~enum|set~", $field->type)) {
             return is_array($row[$name]) ? array_sum($row[$name]) : +$row[$name];
         }
         return is_bool($row[$name]) ? +$row[$name] : $row[$name];
@@ -141,7 +141,7 @@ 
             return "SQL";
         }
         if ($queryOptions["save"]) {
-            return (string)$queryOptions["function"][$name];
+            return (string) $queryOptions["function"][$name];
         }
         if ($update && preg_match('~^CURRENT_TIMESTAMP~i', $field->onUpdate)) {
             return 'now';

src/DbAdmin/TableQueryAdmin.php

Spacing +2 added lines, -2 removed lines

@@ -158,7 +158,7 @@ 
      */
     public function insertItem(string $table, array $queryOptions): array
     {
-        list($fields, ,) = $this->getFields($table, $queryOptions);
+        list($fields,,) = $this->getFields($table, $queryOptions);
 
         // From edit.inc.php
         $values = [];
@@ -188,7 +188,7 @@ 
      */
     public function updateItem(string $table, array $queryOptions): array
     {
-        list($fields, $where, ) = $this->getFields($table, $queryOptions);
+        list($fields, $where,) = $this->getFields($table, $queryOptions);
 
         // From edit.inc.php
         $indexes = $this->driver->indexes($table);

src/DbAdmin/Traits/TableDumpTrait.php

Spacing +2 added lines, -3 removed lines

@@ -53,8 +53,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);
     }
 
@@ -203,7 +202,7 @@ 
         }
         if (!$this->insert) {
             $this->insert = 'INSERT INTO ' . $this->driver->table($table) . ' (' .
-                implode(', ', array_map(function ($key) {
+                implode(', ', array_map(function($key) {
                     return $this->driver->escapeId($key);
                 }, $keys)) . ') VALUES';
         }