lagdo / jaxon-dbadmin

src/Driver/AppDriver.php

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
     /**
      * @inheritDoc
      */
-    public function createConnection(array $options): AbstractConnection|null
+    public function createConnection(array $options): AbstractConnection | null
     {
         return $this->driver->createConnection($options);
     }
@@ -162,7 +162,7 @@ 
     /**
      * @inheritDoc
      */
-    public function execute(string $query): StatementInterface|bool
+    public function execute(string $query): StatementInterface | bool
     {
         $result = $this->driver->execute($query);
         // Call the query callbacks.

src/Driver/Facades/QueryFacade.php

Spacing +5 added lines, -7 removed lines

@@ -63,8 +63,7 @@ 
         // From edit.inc.php
         $fields = $this->driver->fields($table);
         // Important: get the where clauses before filtering the fields.
-        $where = $this->operation === 'insert' ? [] :
-            $this->driver->where($options, $fields);
+        $where = $this->operation === 'insert' ? [] : $this->driver->where($options, $fields);
         // Remove fields without the required privilege, or that cannot be edited.
         $fields = array_filter($fields, fn(TableFieldEntity $field) =>
             isset($field->privileges[$this->operation]) &&
@@ -86,7 +85,7 @@ 
         $this->action = 'read';
         $this->operation = 'insert';
 
-        [$fields,] = $this->getFields($table, $options);
+        [$fields, ] = $this->getFields($table, $options);
         if (empty($fields)) {
             return [
                 'error' => $this->utils->trans->lang('You have no privileges to update this table.'),
@@ -114,8 +113,7 @@ 
         $select = [];
         foreach ($fields as $name => $field) {
             if (isset($field->privileges["select"])) {
-                $as = $this->action === 'clone' && $field->autoIncrement ? "''" :
-                    $this->driver->convertField($field);
+                $as = $this->action === 'clone' && $field->autoIncrement ? "''" : $this->driver->convertField($field);
                 $select[] = ($as ? "$as AS " : "") . $this->driver->escapeId($name);
             }
         }
@@ -160,7 +158,7 @@ 
         }
 
         $rowData = $statement->fetchAssoc();
-        if($this->action === 'select' && (!$rowData || $statement->fetchAssoc()))
+        if ($this->action === 'select' && (!$rowData || $statement->fetchAssoc()))
         {
             // $statement->rowCount() != 1 isn't available in all drivers
             return [
@@ -187,7 +185,7 @@ 
         $this->action = 'save';
         $this->operation = 'insert';
 
-        [$fields,] = $this->getFields($table, $options);
+        [$fields, ] = $this->getFields($table, $options);
         $values = $this->reader()->getInputValues($fields, $values);
 
         if (!$this->driver->insert($table, $values)) {

src/Driver/Facades/CommandFacade.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
      * @param QueryLogger|null $queryLogger
      */
     public function __construct(AbstractFacade $dbFacade,
-        protected TimerService $timer, protected QueryLogger|null $queryLogger)
+        protected TimerService $timer, protected QueryLogger | null $queryLogger)
     {
         parent::__construct($dbFacade);
     }
@@ -231,7 +231,7 @@ 
                 ini_set('memory_limit', max($this->utils->iniBytes('memory_limit'),
                     2 * strlen($queries) + memory_get_usage() + 8e6));
             }
-            catch(\Exception $e) {
+            catch (\Exception $e) {
                 // Do nothing if the option is not modified.
             }
         }
@@ -258,7 +258,7 @@ 
         if ($commands === 0) {
             $messages[] = $this->utils->trans->lang('No commands to execute.');
         } elseif ($onlyErrors) {
-            $messages[] =  $this->utils->trans->lang('%d query(s) executed OK.', $commands - $errors);
+            $messages[] = $this->utils->trans->lang('%d query(s) executed OK.', $commands - $errors);
         }
         return [
             'results' => $this->results,

Braces +1 added lines, -2 removed lines

@@ -230,8 +230,7 @@
             try {
                 ini_set('memory_limit', max($this->utils->iniBytes('memory_limit'),
                     2 * strlen($queries) + memory_get_usage() + 8e6));
-            }
-            catch(\Exception $e) {
+            } catch(\Exception $e) {
                 // Do nothing if the option is not modified.
             }
         }

src/Driver/Facades/SelectFacade.php

Spacing +6 added lines, -9 removed lines

@@ -34,7 +34,7 @@ 
     /**
      * @var SelectEntity|null
      */
-    private SelectEntity|null $selectEntity = null;
+    private SelectEntity | null $selectEntity = null;
 
     /**
      * @param AbstractFacade $dbFacade
@@ -117,11 +117,9 @@ 
         $value = $this->selectEntity->queryOptions["columns"][$valueKey] ?? [];
 
         $fun = $value["fun"] ?? '';
-        $fieldKey = !$this->selectEntity->select ? $key :
-            ($value["col"] ?? current($this->selectEntity->select));
+        $fieldKey = !$this->selectEntity->select ? $key : ($value["col"] ?? current($this->selectEntity->select));
         $field = $this->selectEntity->fields[$fieldKey];
-        $name = !$field ? ($fun ? "*" : $key) :
-            $this->page->fieldName($field, $rank);
+        $name = !$field ? ($fun ? "*" : $key) : $this->page->fieldName($field, $rank);
 
         return [$fun, $name, $field];
     }
@@ -247,8 +245,7 @@ 
     private function getRowIdMd5Key(string $key, string $collation): string
     {
         return $this->driver->jush() != 'sql' ||
-            preg_match("~^utf8~", $collation) ? $key :
-                "CONVERT($key USING " . $this->driver->charset() . ")";
+            preg_match("~^utf8~", $collation) ? $key : "CONVERT($key USING " . $this->driver->charset() . ")";
     }
 
     /**
@@ -357,8 +354,8 @@ 
             $query = $this->driver->getRowCountQuery($table,
                 $this->selectEntity->where, $this->hasGroupsInFields(),
                 $this->selectEntity->group);
-            return (int)$this->driver->result($query);
-        } catch(Exception $_) {
+            return (int) $this->driver->result($query);
+        } catch (Exception $_) {
             return -1;
         }
     }

src/Driver/Facades/TableFacade.php

Spacing +3 added lines, -4 removed lines

@@ -126,8 +126,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->driver->processField($field, $typeField);
         $origField = $this->fields[$field->name] ?? null;
         $this->after = '';
@@ -374,14 +373,14 @@ 
                 $target .= '<b>' . $this->utils->str->html($foreignKey->schema) . '</b>.';
             }
             $target = $this->utils->str->html($foreignKey->table) .
-                '(' . implode(', ', array_map(function ($key) {
+                '(' . implode(', ', array_map(function($key) {
                     return $this->utils->str->html($key);
                 }, $foreignKey->target)) . ')';
             $details[] = [
                 'name' => $this->utils->str->html($name),
                 'source' => '<i>' . implode(
                     '</i>, <i>',
-                    array_map(function ($key) {
+                    array_map(function($key) {
                         return $this->utils->str->html($key);
                     }, $foreignKey->source)
                 ) . '</i>',

src/Driver/Facades/ExportFacade.php

Spacing +6 added lines, -10 removed lines

@@ -144,8 +144,7 @@ 
             $key = $this->driver->escapeId($field->name());
             $values[] = "$key = VALUES($key)";
         }
-        $dump->suffix = $this->options['data_style'] !== 'INSERT+UPDATE' ? ';' :
-            "\nON DUPLICATE KEY UPDATE " . implode(', ', $values) . ';';
+        $dump->suffix = $this->options['data_style'] !== 'INSERT+UPDATE' ? ';' : "\nON DUPLICATE KEY UPDATE " . implode(', ', $values) . ';';
 
         return $keys;
     }
@@ -171,7 +170,7 @@ 
 
         if ($dump->insert === '') {
             $dump->insert = 'INSERT INTO ' . $this->driver->escapeTableName($dump->table) . ' (' .
-                implode(', ', array_map(function ($key) {
+                implode(', ', array_map(function($key) {
                     return $this->driver->escapeId($key);
                 }, $keys)) . ') VALUES';
         }
@@ -197,8 +196,7 @@ 
         $fields = $this->options['format'] !== 'sql' ? [] : $this->driver->fields($dump->table);
         $keys = [];
         $fetchFunction = $dump->table !== '' ?
-            fn($statement) => $statement->fetchAssoc() :
-            fn($statement) => $statement->fetchRow();
+            fn($statement) => $statement->fetchAssoc() : fn($statement) => $statement->fetchRow();
         while ($row = $fetchFunction($statement)) {
             if (empty($keys)) {
                 $keys = $this->getDataRowKeys($dump, $row, $statement);
@@ -467,12 +465,10 @@ 
         // From dump.inc.php create_routine()
         $routineName = $this->driver->escapeId(trim($routine->name));
         $routineParams = $this->getRoutineParams($routineInfo->params);
-        $routineReturns = $routine->type !== 'FUNCTION' ? '' :
-            ' RETURNS' . $this->driver->processType($routineInfo->return, 'CHARACTER SET');
+        $routineReturns = $routine->type !== 'FUNCTION' ? '' : ' RETURNS' . $this->driver->processType($routineInfo->return, 'CHARACTER SET');
         $routineLanguage = $routineInfo->language ? " LANGUAGE {$routineInfo->language}" : '';
         $definition = rtrim($routineInfo->definition, ';');
-        $routineDefinition = $this->driver->jush() !== 'pgsql' ? "\n$definition;" :
-            ' AS ' . $this->driver->quote($definition);
+        $routineDefinition = $this->driver->jush() !== 'pgsql' ? "\n$definition;" : ' AS ' . $this->driver->quote($definition);
 
         return "CREATE {$routine->type} $routineName ($routineParams)" .
             "{$routineReturns}{$routineLanguage}{$routineDefinition};";
@@ -638,7 +634,7 @@ 
      *
      * @return array|string
      */
-    public function exportDatabases(array $databases, array $options): array|string
+    public function exportDatabases(array $databases, array $options): array | string
     {
         // From dump.inc.php
         // $tables = array_flip($options['tables']) + array_flip($options['data']);

Braces +1 added lines, -2 removed lines

@@ -279,8 +279,7 @@
         foreach ($databases as $database => $tables) {
             try {
                 $this->dumpDatabase($database, $tables);
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 return $e->getMessage();
             }
         }

src/Driver/Facades/AbstractFacade.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     /**
      * @var AppDriver|null
      */
-    protected AppDriver|null $driver = null;
+    protected AppDriver | null $driver = null;
 
     /**
      * @var AppPage

src/Page/Dql/SelectOptions.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
     {
         return [
             'select' => $select,
-            'values' => (array)$options["columns"],
+            'values' => (array) $options["columns"],
             'columns' => $columns,
             'functions' => $this->driver->functions(),
             'grouping' => $this->driver->grouping(),
@@ -49,7 +49,7 @@ 
         }
         return [
             // 'where' => $where,
-            'values' => (array)$options["where"],
+            'values' => (array) $options["where"],
             'columns' => $columns,
             'indexes' => $indexes,
             'operators' => $this->driver->operators(),
@@ -68,8 +68,8 @@ 
     private function getSortingOptions(array $columns, array $options): array
     {
         $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/Page/Dml/DataFieldValue.php

Indentation +1 added lines, -1 removed lines

@@ -203,7 +203,7 @@
         $editField->fullType = $this->utils->str->html($field->fullType);
 
         if (is_array($editField->value) && !$editField->function) {
-             // 128 - JSON_PRETTY_PRINT, 64 - JSON_UNESCAPED_SLASHES, 256 - JSON_UNESCAPED_UNICODE available since PHP 5.4
+                // 128 - JSON_PRETTY_PRINT, 64 - JSON_UNESCAPED_SLASHES, 256 - JSON_UNESCAPED_UNICODE available since PHP 5.4
             $editField->value = json_encode($editField->value,
                 JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
             $editField->function = 'json';

Spacing +3 added lines, -3 removed lines

@@ -112,7 +112,7 @@ 
      *
      * @return mixed
      */
-    private function getFieldDefaultValue(TableFieldEntity $field, array|null $rowData): mixed
+    private function getFieldDefaultValue(TableFieldEntity $field, array | null $rowData): mixed
     {
         $update = $this->operation === 'update';
         // $default = $options["set"][$this->driver->bracketEscape($name)] ?? null;
@@ -150,7 +150,7 @@ 
      *
      * @return array
      */
-    private function getInputValues(TableFieldEntity $field, array|null $rowData): array
+    private function getInputValues(TableFieldEntity $field, array | null $rowData): array
     {
         $value = $this->getFieldDefaultValue($field, $rowData);
         // if (!$this->action !== 'save' && is_string($value)) {
@@ -191,7 +191,7 @@ 
      *
      * @return FieldEditEntity
      */
-    public function getFieldInputValues(TableFieldEntity $field, array|null $rowData): FieldEditEntity
+    public function getFieldInputValues(TableFieldEntity $field, array | null $rowData): FieldEditEntity
     {
         $editField = new FieldEditEntity($field);