lagdo / jaxon-dbadmin

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

Braces +2 added lines, -4 removed lines

@@ -924,11 +924,9 @@
         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
-            }
-            else {
+            } else {
                 $link = '';
             }
         }