lagdo / jaxon-dbadmin

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

src/DbAdmin/CommandAdmin.php

Braces +1 added lines, -2 removed lines

@@ -325,8 +325,7 @@
             try {
                 \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.
             }
         }

Indentation +5 added lines, -5 removed lines

@@ -38,7 +38,7 @@ 
      * @param mixed $value
      *
      * @return string
-    */
+     */
     // protected function editLink($value)
     // {
     //     $link = '';
@@ -65,7 +65,7 @@ 
      * @param array $types
      *
      * @return string
-    */
+     */
     protected function values(array $row, array $blobs, array $types)
     {
         $values = [];
@@ -92,7 +92,7 @@ 
      * @param int $limit
      *
      * @return string
-    */
+     */
     private function message($statement, int $limit)
     {
         $numRows = $statement->rowCount();
@@ -111,7 +111,7 @@ 
      * @param array $orgtables
      *
      * @return string
-    */
+     */
     // protected function indexes($field, array $orgtables)
     // {
     //     static $links = []; // colno => orgtable - create links from these columns
@@ -148,7 +148,7 @@ 
      * @param int $limit
      *
      * @return array
-    */
+     */
     protected function select($statement, $limit = 0)
     {
         $blobs = []; // colno => bool - display bytes for blobs

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