lagdo / jaxon-dbadmin

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

@@ -279,14 +279,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>',
@@ -469,7 +469,7 @@ 
     private function getTableAttrs(array $values, string $table = '', array $origFields = [])
     {
         // From create.inc.php
-        $values['fields'] = (array)$values['fields'];
+        $values['fields'] = (array) $values['fields'];
         if ($values['autoIncrementCol']) {
             $values['fields'][$values['autoIncrementCol']]['autoIncrement'] = true;
         }
@@ -486,8 +486,7 @@ 
             $field = TableFieldEntity::make($field);
             $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]));
             // Originally, deleted fields have the "field" field set to an empty string.
             // But in our implementation, the "name" field is not set.
             if ($field->name != '') {