lagdo / jaxon-dbadmin

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

@@ -210,9 +210,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 @@ 
 
         if (!empty($found) && \rtrim($found) != $delimiter) {
             // 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];
@@ -326,7 +323,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 - \count($errors));
+            $messages[] = $this->trans->lang('%d query(s) executed OK.', $commands - \count($errors));
             // $timestamps[] = $this->trans->formatTime($total_start);
         }
         // elseif($errors && $commands > 1)