vakata / database

src/schema/TableQueryMapped.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     protected static array $mappers = [];
     protected MapperInterface $mapper;
 
-    public function __construct(DBInterface $db, Table|string $table, bool $findRelations = false)
+    public function __construct(DBInterface $db, Table | string $table, bool $findRelations = false)
     {
         parent::__construct($db, $table, $findRelations);
         if (!isset(static::$mappers[spl_object_hash($db)])) {

src/schema/Mapper.php

Spacing +7 added lines, -8 removed lines

@@ -52,7 +52,7 @@ 
     public function collection(TableQueryIterator $iterator, Table $definition) : Collection
     {
         return Collection::from($iterator)
-            ->map(function ($v) use ($definition) {
+            ->map(function($v) use ($definition) {
                 return $this->entity($definition, $v);
             });
     }
@@ -136,7 +136,7 @@ 
         $definition = $entity->definition();
         foreach ($definition->getColumns() as $column) {
             if (!array_key_exists($column, $data)) {
-                $entity->__lazyProperty($column, function () use ($definition, $primary, $column) {
+                $entity->__lazyProperty($column, function() use ($definition, $primary, $column) {
                     $query = $this->db->table($definition->getFullName());
                     foreach ($primary as $k => $v) {
                         $query->filter($k, $v);
@@ -150,18 +150,18 @@ 
                 $name,
                 array_key_exists($name, $data) && isset($data[$name]) ?
                     ($relation->many ?
-                        array_map(function ($v) use ($relation) {
+                        array_map(function($v) use ($relation) {
                             return $this->entity($relation->table, $v);
                         }, $data[$name]) :
                         $this->entity($relation->table, $data[$name])
                     ) :
-                    function (array $columns = null, string $order = null, bool $desc = false) use ($entity, $definition, $relation, $data) {
+                    function(array $columns = null, string $order = null, bool $desc = false) use ($entity, $definition, $relation, $data) {
                         $query = $this->db->tableMapped($relation->table->getFullName());
                         if ($columns !== null) {
                             $query->columns($columns);
                         }
                         if ($relation->sql) {
-                            $query->where($relation->sql, $relation->par?:[]);
+                            $query->where($relation->sql, $relation->par ?: []);
                         }
                         if ($relation->pivot) {
                             $nm = null;
@@ -181,7 +181,7 @@ 
                                 );
                             }
                             foreach ($definition->getPrimaryKey() as $v) {
-                                $query->filter($nm . '.' . $v, $data[$v] ?? null);
+                                $query->filter($nm.'.'.$v, $data[$v] ?? null);
                             }
                         } else {
                             foreach ($relation->keymap as $k => $v) {
@@ -192,8 +192,7 @@ 
                             $query->sort($order, $desc);
                         }
                         return $relation->many ?
-                            $query->iterator() :
-                            $query[0];
+                            $query->iterator() : $query[0];
                     }
             );
         }

src/driver/postgre/Result.php

Spacing +6 added lines, -7 removed lines

@@ -37,8 +37,7 @@ 
             $temp = @\pg_query(
                 $this->driver,
                 $sequence ?
-                    'SELECT currval('.@\pg_escape_string($this->driver, $sequence).')' :
-                    'SELECT lastval()'
+                    'SELECT currval('.@\pg_escape_string($this->driver, $sequence).')' : 'SELECT lastval()'
             );
             if ($temp) {
                 $res = \pg_fetch_row($temp);
@@ -76,8 +75,8 @@ 
     }
     public function next(): void
     {
-        $this->fetched ++;
-        $this->last = \pg_fetch_array($this->statement, null, \PGSQL_ASSOC)?:null;
+        $this->fetched++;
+        $this->last = \pg_fetch_array($this->statement, null, \PGSQL_ASSOC) ?: null;
         if (is_array($this->last) && count($this->last)) {
             $this->cast();
         }
@@ -102,15 +101,15 @@ 
                 case 'int2':
                 case 'int4':
                 case 'int8':
-                    $this->last[$k] = (int)$v;
+                    $this->last[$k] = (int) $v;
                     break;
                 case 'bit':
                 case 'bool':
-                    $this->last[$k] = $v !== 'f' && (int)$v ? true : false;
+                    $this->last[$k] = $v !== 'f' && (int) $v ? true : false;
                     break;
                 case 'float4':
                 case 'float8':
-                    $this->last[$k] = (float)$v;
+                    $this->last[$k] = (float) $v;
                 case 'money':
                 case 'numeric':
                     // TODO:

src/driver/oracle/Result.php

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,7 @@ 
     }
     public function affected() : int
     {
-        return (int)\oci_num_rows($this->statement);
+        return (int) \oci_num_rows($this->statement);
     }
     public function insertID(string $sequence = null): mixed
     {
@@ -37,7 +37,7 @@ 
 
     public function count(): int
     {
-        return (int)\oci_num_rows($this->statement);
+        return (int) \oci_num_rows($this->statement);
     }
 
     public function key(): mixed
@@ -65,8 +65,8 @@ 
     }
     public function next(): void
     {
-        $this->fetched ++;
-        $this->last = \oci_fetch_array($this->statement, \OCI_ASSOC + \OCI_RETURN_NULLS + \OCI_RETURN_LOBS)?:null;
+        $this->fetched++;
+        $this->last = \oci_fetch_array($this->statement, \OCI_ASSOC +\OCI_RETURN_NULLS +\OCI_RETURN_LOBS) ?: null;
         if (is_array($this->last) && count($this->last)) {
             $this->cast();
         }
@@ -82,7 +82,7 @@ 
                 $this->types[$v] = \oci_field_type($this->statement, $k + 1);
                 if ($this->types[$v] === 'NUMBER') {
                     $size = \oci_field_size($this->statement, $k + 1);
-                    if ((int)(explode(',', $size, 2)[1] ?? '') > 0) {
+                    if ((int) (explode(',', $size, 2)[1] ?? '') > 0) {
                         $this->types[$v] === 'FLOAT';
                     }
                 }
@@ -94,10 +94,10 @@ 
             }
             switch ($this->types[$k]) {
                 case 'NUMBER':
-                    $this->last[$k] = (int)$v;
+                    $this->last[$k] = (int) $v;
                     break;
                 case 'FLOAT':
-                    $this->last[$k] = (float)$v;
+                    $this->last[$k] = (float) $v;
                     break;
             }
         }

src/DB.php

Spacing +24 added lines, -25 removed lines

@@ -69,18 +69,18 @@ 
                 ];
             }
         }
-        $connection['type'] = isset($temp['scheme']) && strlen((string)$temp['scheme']) ? $temp['scheme'] : null;
-        $connection['user'] = isset($temp['user']) && strlen((string)$temp['user']) ? $temp['user'] : null;
-        $connection['pass'] = isset($temp['pass']) && strlen((string)$temp['pass']) ? $temp['pass'] : null;
-        $connection['host'] = isset($temp['host']) && strlen((string)$temp['host']) ? $temp['host'] : null;
-        $connection['name'] = isset($temp['path']) && strlen((string)$temp['path']) ? trim((string)$temp['path'], '/') : null;
-        $connection['port'] = isset($temp['port']) && (int)$temp['port'] ? (int)$temp['port'] : null;
-        if (isset($temp['query']) && strlen((string)$temp['query'])) {
-            parse_str((string)$temp['query'], $connection['opts']);
+        $connection['type'] = isset($temp['scheme']) && strlen((string) $temp['scheme']) ? $temp['scheme'] : null;
+        $connection['user'] = isset($temp['user']) && strlen((string) $temp['user']) ? $temp['user'] : null;
+        $connection['pass'] = isset($temp['pass']) && strlen((string) $temp['pass']) ? $temp['pass'] : null;
+        $connection['host'] = isset($temp['host']) && strlen((string) $temp['host']) ? $temp['host'] : null;
+        $connection['name'] = isset($temp['path']) && strlen((string) $temp['path']) ? trim((string) $temp['path'], '/') : null;
+        $connection['port'] = isset($temp['port']) && (int) $temp['port'] ? (int) $temp['port'] : null;
+        if (isset($temp['query']) && strlen((string) $temp['query'])) {
+            parse_str((string) $temp['query'], $connection['opts']);
         }
         // create the driver
         $connection['type'] = $aliases[$connection['type']] ?? $connection['type'];
-        $tmp = '\\vakata\\database\\driver\\'.strtolower((string)$connection['type']).'\\Driver';
+        $tmp = '\\vakata\\database\\driver\\'.strtolower((string) $connection['type']).'\\Driver';
         if (!class_exists($tmp)) {
             throw new DBException('Unknown DB backend');
         }
@@ -118,7 +118,7 @@ 
         $new = '';
         $par = array_values($par);
         if (substr_count($sql, '?') === 2 && !is_array($par[0])) {
-            $par = [ $par ];
+            $par = [$par];
         }
         $parts = explode('??', $sql);
         $index = 0;
@@ -128,7 +128,7 @@ 
             $index += count($tmp) - 1;
             if (isset($par[$index])) {
                 if (!is_array($par[$index])) {
-                    $par[$index] = [ $par[$index] ];
+                    $par[$index] = [$par[$index]];
                 }
                 $params = $par[$index];
                 array_splice($par, $index, 1, $params);
@@ -136,7 +136,7 @@ 
                 $new .= implode(',', array_fill(0, count($params), '?'));
             }
         }
-        return [ $new, $par ];
+        return [$new, $par];
     }
     /**
      * Run a query (prepare & execute).
@@ -185,7 +185,7 @@ 
     ): Collection {
         $coll = Collection::from($this->query($sql, $par, $buff));
         if (($keys = $this->driver->option('mode')) && in_array($keys, ['strtoupper', 'strtolower'])) {
-            $coll->map(function ($v) use ($keys) {
+            $coll->map(function($v) use ($keys) {
                 $new = [];
                 foreach ($v as $k => $vv) {
                     $new[call_user_func($keys, $k)] = $vv;
@@ -194,18 +194,18 @@ 
             });
         }
         if ($key !== null) {
-            $coll->mapKey(function ($v) use ($key) {
+            $coll->mapKey(function($v) use ($key) {
                 return $v[$key];
             });
         }
         if ($skip) {
-            $coll->map(function ($v) use ($key) {
+            $coll->map(function($v) use ($key) {
                 unset($v[$key]);
                 return $v;
             });
         }
         if ($opti) {
-            $coll->map(function ($v) {
+            $coll->map(function($v) {
                 return count($v) === 1 ? current($v) : $v;
             });
         }
@@ -324,13 +324,13 @@ 
      */
     public function getSchema(bool $asPlainArray = true): array
     {
-        return !$asPlainArray ? $this->tables : array_map(function ($table) {
+        return !$asPlainArray ? $this->tables : array_map(function($table) {
             return [
                 'name' => $table->getName(),
                 'schema' => $table->getSchema(),
                 'pkey' => $table->getPrimaryKey(),
                 'comment' => $table->getComment(),
-                'columns' => array_map(function ($column) {
+                'columns' => array_map(function($column) {
                     return [
                         'name' => $column->getName(),
                         'type' => $column->getType(),
@@ -341,9 +341,9 @@ 
                         'nullable' => $column->isNullable()
                     ];
                 }, $table->getFullColumns()),
-                'relations' => array_map(function ($rel) {
+                'relations' => array_map(function($rel) {
                     $relation = clone $rel;
-                    $relation = (array)$relation;
+                    $relation = (array) $relation;
                     $relation['table'] = $rel->table->getName();
                     if ($rel->pivot) {
                         $relation['pivot'] = $rel->pivot->getName();
@@ -405,11 +405,10 @@ 
     {
         return new TableQueryMapped($this, $this->definition($table), $findRelations);
     }
-    public function __call(string $method, array $args): TableQuery|TableQueryMapped
+    public function __call(string $method, array $args): TableQuery | TableQueryMapped
     {
         return ($args[0] ?? false) ?
-            $this->tableMapped($method, $args[1] ?? false) :
-            $this->table($method, $args[1] ?? false);
+            $this->tableMapped($method, $args[1] ?? false) : $this->table($method, $args[1] ?? false);
     }
     public function findRelation(string $start, string $end): array
     {
@@ -442,12 +441,12 @@ 
                     $relations[$t] = $w;
                 }
                 if (!isset($schema[$name])) {
-                    $schema[$name] = [ 'edges' => [] ];
+                    $schema[$name] = ['edges' => []];
                 }
                 foreach ($relations as $t => $w) {
                     $schema[$name]['edges'][$t] = $w;
                     if (!isset($schema[$t])) {
-                        $schema[$t] = [ 'edges' => [] ];
+                        $schema[$t] = ['edges' => []];
                     }
                     $schema[$t]['edges'][$name] = $w;
                 }

src/driver/oracle/Driver.php

Spacing +3 added lines, -3 removed lines

@@ -77,11 +77,11 @@
         );
         if ($log) {
             $tm = microtime(true) - $tm;
-            if ($tm >= (float)$this->option('log_slow', 0)) {
+            if ($tm >= (float) $this->option('log_slow', 0)) {
                 @file_put_contents(
                     $log,
-                    '--' . date('Y-m-d H:i:s') . ' ' . sprintf('%01.6f', $tm) . "s\r\n" .
-                    $sql . "\r\n" .
+                    '--'.date('Y-m-d H:i:s').' '.sprintf('%01.6f', $tm)."s\r\n".
+                    $sql."\r\n".
                     "\r\n",
                     FILE_APPEND
                 );

src/driver/oracle/Schema.php

Spacing +26 added lines, -26 removed lines

@@ -29,19 +29,19 @@ 
         $columns = Collection::from($this
             ->query(
                 "SELECT * FROM all_tab_cols WHERE table_name = ? AND owner = ? and hidden_column = 'NO'",
-                [ strtoupper($table), $this->name() ]
+                [strtoupper($table), $this->name()]
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
                 }
                 return $new;
             })
-            ->mapKey(function ($v) {
+            ->mapKey(function($v) {
                 return $v['COLUMN_NAME'];
             })
-            ->map(function ($v) {
+            ->map(function($v) {
                 $v['length'] = null;
                 if (!isset($v['DATA_TYPE'])) {
                     return $v;
@@ -53,7 +53,7 @@ 
                     default:
                         if (strpos($type, 'char') !== false && strpos($type, '(') !== false) {
                             // extract length from varchar
-                            $v['length'] = (int)explode(')', (explode('(', $type)[1] ?? ''))[0];
+                            $v['length'] = (int) explode(')', (explode('(', $type)[1] ?? ''))[0];
                             $v['length'] = $v['length'] > 0 ? $v['length'] : null;
                         }
                         break;
@@ -69,9 +69,9 @@ 
             ->query(
                 "SELECT constraint_name FROM all_constraints
                 WHERE table_name = ? AND constraint_type = ? AND owner = ?",
-                [ strtoupper($table), 'P', $owner ]
+                [strtoupper($table), 'P', $owner]
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
@@ -86,9 +86,9 @@ 
                 ->query(
                     "SELECT column_name FROM all_cons_columns
                     WHERE table_name = ? AND constraint_name = ? AND owner = ?",
-                    [ strtoupper($table), $pkname, $owner ]
+                    [strtoupper($table), $pkname, $owner]
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -115,9 +115,9 @@ 
                     LEFT JOIN all_cons_columns cc ON cc.OWNER = ac.OWNER AND cc.CONSTRAINT_NAME = ac.CONSTRAINT_NAME
                     WHERE ac.OWNER = ? AND ac.R_OWNER = ? AND ac.R_CONSTRAINT_NAME = ? AND ac.CONSTRAINT_TYPE = ?
                     ORDER BY cc.POSITION",
-                    [ $owner, $owner, $pkname, 'R' ]
+                    [$owner, $owner, $pkname, 'R']
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -127,7 +127,7 @@ 
                  as $relation
             ) {
                 $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_NAME'];
-                $relations[$relation['CONSTRAINT_NAME']]['keymap'][$primary[(int)$relation['POSITION']-1]] =
+                $relations[$relation['CONSTRAINT_NAME']]['keymap'][$primary[(int) $relation['POSITION'] - 1]] =
                     $relation['COLUMN_NAME'];
             }
             foreach ($relations as $data) {
@@ -157,9 +157,9 @@ 
                                 ac.OWNER = ? AND ac.R_OWNER = ? AND ac.TABLE_NAME = ? AND ac.CONSTRAINT_TYPE = ? AND
                                 cc.COLUMN_NAME IN (??)
                             ORDER BY POSITION",
-                            [ $owner, $owner, $data['table'], 'R', $columns ]
+                            [$owner, $owner, $data['table'], 'R', $columns]
                         ))
-                        ->map(function ($v) {
+                        ->map(function($v) {
                             $new = [];
                             foreach ($v as $kk => $vv) {
                                 $new[strtoupper($kk)] = $vv;
@@ -179,9 +179,9 @@ 
                         ->query(
                             "SELECT COLUMN_NAME FROM all_cons_columns
                              WHERE OWNER = ? AND CONSTRAINT_NAME = ? ORDER BY POSITION",
-                            [ $owner, current($foreign['keymap']) ]
+                            [$owner, current($foreign['keymap'])]
                         ))
-                        ->map(function ($v) {
+                        ->map(function($v) {
                             $new = [];
                             foreach ($v as $kk => $vv) {
                                 $new[strtoupper($kk)] = $vv;
@@ -196,7 +196,7 @@ 
                     $relname = $foreign['table'];
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $foreign['table'] . '_' . (++ $cntr);
+                        $relname = $foreign['table'].'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -212,7 +212,7 @@ 
                     $relname = $data['table'];
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $data['table'] . '_' . (++ $cntr);
+                        $relname = $data['table'].'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -240,9 +240,9 @@ 
                     LEFT JOIN all_cons_columns cc ON cc.OWNER = ac.OWNER AND cc.CONSTRAINT_NAME = ac.CONSTRAINT_NAME
                     WHERE ac.OWNER = ? AND ac.R_OWNER = ? AND ac.TABLE_NAME = ? AND ac.CONSTRAINT_TYPE = ?
                     ORDER BY cc.POSITION",
-                    [ $owner, $owner, strtoupper($table), 'R' ]
+                    [$owner, $owner, strtoupper($table), 'R']
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -260,9 +260,9 @@ 
                     ->query(
                         "SELECT COLUMN_NAME FROM all_cons_columns
                          WHERE OWNER = ? AND CONSTRAINT_NAME = ? ORDER BY POSITION",
-                        [ $owner, current($data['keymap']) ]
+                        [$owner, current($data['keymap'])]
                     ))
-                    ->map(function ($v) {
+                    ->map(function($v) {
                         $new = [];
                         foreach ($v as $kk => $vv) {
                             $new[strtoupper($kk)] = $vv;
@@ -277,7 +277,7 @@ 
                 $relname = $data['table'];
                 $cntr = 1;
                 while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                    $relname = $data['table'] . '_' . (++ $cntr);
+                    $relname = $data['table'].'_'.(++$cntr);
                 }
                 $definition->addRelation(
                     new TableRelation(
@@ -298,18 +298,18 @@ 
                 "SELECT TABLE_NAME FROM ALL_TABLES where OWNER = ?",
                 [$this->connection['name']]
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
                 }
                 return $new;
             })
-            ->mapKey(function ($v) {
+            ->mapKey(function($v) {
                 return strtolower($v['TABLE_NAME']);
             })
             ->pluck('TABLE_NAME')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->table($v)->toLowerCase();
             })
             ->toArray();

src/driver/postgre/Schema.php

Spacing +29 added lines, -29 removed lines

@@ -29,8 +29,8 @@ 
             $table = $temp[1];
         }
 
-        if (isset($tables[$schema . '.' . $table])) {
-            return $tables[$schema . '.' . $table];
+        if (isset($tables[$schema.'.'.$table])) {
+            return $tables[$schema.'.'.$table];
         }
 
         static $relationsT = null;
@@ -61,7 +61,7 @@ 
                         (kc.table_schema = ? OR ct.table_schema = ?) AND
                         kc.table_name IS NOT NULL AND
                         kc.position_in_unique_constraint IS NOT NULL",
-                    [ $catalog, $main, $main ]
+                    [$catalog, $main, $main]
                 )
             )->toArray();
             foreach ($col as $row) {
@@ -71,8 +71,8 @@ 
                 if ($row['referenced_table_schema'] !== $main) {
                     $additional[] = $row['referenced_table_schema'];
                 }
-                $relationsT[$row['table_schema'] . '.' . $row['table_name']][] = $row;
-                $relationsR[$row['referenced_table_schema'] . '.' . $row['referenced_table_name']][] = $row;
+                $relationsT[$row['table_schema'].'.'.$row['table_name']][] = $row;
+                $relationsR[$row['referenced_table_schema'].'.'.$row['referenced_table_name']][] = $row;
             }
             foreach (array_filter(array_unique($additional)) as $s) {
                 $col = Collection::from(
@@ -97,12 +97,12 @@ 
                             (kc.table_schema = ? AND ct.table_schema = ?) AND
                             kc.table_name IS NOT NULL AND
                             kc.position_in_unique_constraint IS NOT NULL",
-                        [ $catalog, $s, $s ]
+                        [$catalog, $s, $s]
                     )
                 )->toArray();
                 foreach ($col as $row) {
-                    $relationsT[$row['table_schema'] . '.' . $row['table_name']][] = $row;
-                    $relationsR[$row['referenced_table_schema'] . '.' . $row['referenced_table_name']][] = $row;
+                    $relationsT[$row['table_schema'].'.'.$row['table_name']][] = $row;
+                    $relationsR[$row['referenced_table_schema'].'.'.$row['referenced_table_name']][] = $row;
                 }
             }
         }
@@ -110,12 +110,12 @@ 
         $columns = Collection::from($this
             ->query(
                 "SELECT * FROM information_schema.columns WHERE table_name = ? AND table_schema = ? AND table_catalog = ?",
-                [ $table, $schema, $catalog ]
+                [$table, $schema, $catalog]
             ))
-            ->mapKey(function ($v) {
+            ->mapKey(function($v) {
                 return $v['column_name'];
             })
-            ->map(function ($v) {
+            ->map(function($v) {
                 $v['length'] = null;
                 if (!isset($v['data_type'])) {
                     return $v;
@@ -123,20 +123,20 @@ 
                 switch ($v['data_type']) {
                     case 'character':
                     case 'character varying':
-                        $v['length'] = (int)$v['character_maximum_length'];
+                        $v['length'] = (int) $v['character_maximum_length'];
                         break;
                 }
                 return $v;
             })
             ->toArray();
         if (!count($columns)) {
-            throw new DBException('Table not found by name: ' . implode('.', [$schema,$table]));
+            throw new DBException('Table not found by name: '.implode('.', [$schema, $table]));
         }
         $pkname = Collection::from($this
             ->query(
                 "SELECT constraint_name FROM information_schema.table_constraints
                 WHERE table_name = ? AND constraint_type = ? AND table_schema = ? AND table_catalog = ?",
-                [ $table, 'PRIMARY KEY', $schema, $catalog ]
+                [$table, 'PRIMARY KEY', $schema, $catalog]
             ))
             ->pluck('constraint_name')
             ->value();
@@ -146,12 +146,12 @@ 
                 ->query(
                     "SELECT column_name FROM information_schema.constraint_column_usage
                      WHERE table_name = ? AND constraint_name = ? AND table_schema = ? AND table_catalog = ?",
-                    [ $table, $pkname, $schema, $catalog ]
+                    [$table, $pkname, $schema, $catalog]
                 ))
                 ->pluck('column_name')
                 ->toArray();
         }
-        $tables[$schema . '.' .$table] = $definition = (new Table($table, $schema))
+        $tables[$schema.'.'.$table] = $definition = (new Table($table, $schema))
             ->addColumns($columns)
             ->setPrimaryKey($primary)
             ->setComment('');
@@ -161,8 +161,8 @@ 
             // assuming current table is on the "one" end having "many" records in the referencing table
             // resulting in a "hasMany" or "manyToMany" relationship (if a pivot table is detected)
             $relations = [];
-            foreach ($relationsR[$schema . '.' . $table] ?? [] as $relation) {
-                $relations[$relation['constraint_name']]['table'] = $relation['table_schema'] . '.' . $relation['table_name'];
+            foreach ($relationsR[$schema.'.'.$table] ?? [] as $relation) {
+                $relations[$relation['constraint_name']]['table'] = $relation['table_schema'].'.'.$relation['table_name'];
                 $relations[$relation['constraint_name']]['keymap'][$relation['referenced_column_name']] =
                     $relation['column_name'];
             }
@@ -178,11 +178,11 @@ 
                 $usedcol = [];
                 if (count($columns)) {
                     foreach (Collection::from($relationsT[$data['table']] ?? [])
-                        ->filter(function ($v) use ($columns) {
+                        ->filter(function($v) use ($columns) {
                             return in_array($v['column_name'], $columns);
                         }) as $relation
                     ) {
-                        $foreign[$relation['constraint_name']]['table'] = $relation['referenced_table_schema'] . '.' . $relation['referenced_table_name'];
+                        $foreign[$relation['constraint_name']]['table'] = $relation['referenced_table_schema'].'.'.$relation['referenced_table_name'];
                         $foreign[$relation['constraint_name']]['keymap'][$relation['column_name']] =
                             $relation['referenced_column_name'];
                         $usedcol[] = $relation['column_name'];
@@ -202,7 +202,7 @@ 
                         $definition->getName() == $relname ||
                         $definition->getColumn($relname)
                     ) {
-                        $relname = $orig . '_' . (++ $cntr);
+                        $relname = $orig.'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -227,7 +227,7 @@ 
                         $definition->getName() == $relname ||
                         $definition->getColumn($relname)
                     ) {
-                        $relname = $orig . '_' . (++ $cntr);
+                        $relname = $orig.'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -243,8 +243,8 @@ 
             // assuming current table is linked to "one" record in the referenced table
             // resulting in a "belongsTo" relationship
             $relations = [];
-            foreach ($relationsT[$schema . '.' . $table] ?? [] as $relation) {
-                $relations[$relation['constraint_name']]['table'] = $relation['referenced_table_schema'] . '.' . $relation['referenced_table_name'];
+            foreach ($relationsT[$schema.'.'.$table] ?? [] as $relation) {
+                $relations[$relation['constraint_name']]['table'] = $relation['referenced_table_schema'].'.'.$relation['referenced_table_name'];
                 $relations[$relation['constraint_name']]['keymap'][$relation['column_name']] =
                     $relation['referenced_column_name'];
             }
@@ -261,7 +261,7 @@ 
                     $definition->getName() == $relname ||
                     $definition->getColumn($relname)
                 ) {
-                    $relname = $orig . '_' . (++ $cntr);
+                    $relname = $orig.'_'.(++$cntr);
                 }
                 $definition->addRelation(
                     new TableRelation(
@@ -280,19 +280,19 @@ 
         $tables = Collection::from($this
             ->query(
                 "SELECT table_name FROM information_schema.tables where table_schema = ? AND table_catalog = ?",
-                [ $this->connection['opts']['schema'] ?? 'public', $this->connection['name'] ]
+                [$this->connection['opts']['schema'] ?? 'public', $this->connection['name']]
             ))
-            ->mapKey(function ($v) {
+            ->mapKey(function($v) {
                 return strtolower($v['table_name']);
             })
             ->pluck('table_name')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->table($v)->toLowerCase();
             })
             ->toArray();
 
         foreach (array_keys($tables) as $k) {
-            $tables[($this->connection['opts']['schema'] ?? 'public') . '.' . $k] = &$tables[$k];
+            $tables[($this->connection['opts']['schema'] ?? 'public').'.'.$k] = &$tables[$k];
         }
         return $tables;
     }

src/driver/mysql/Schema.php

Spacing +30 added lines, -30 removed lines

@@ -27,8 +27,8 @@ 
             $table = $temp[1];
         }
 
-        if (isset($tables[$schema . '.' . $table])) {
-            return $tables[$schema . '.' . $table];
+        if (isset($tables[$schema.'.'.$table])) {
+            return $tables[$schema.'.'.$table];
         }
 
         static $comments = [];
@@ -36,10 +36,10 @@ 
             $comments[$schema] = Collection::from(
                 $this->query(
                     "SELECT TABLE_NAME, TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = ?",
-                    [ $schema ]
+                    [$schema]
                 )
             )
-            ->mapKey(function (array $v): string {
+            ->mapKey(function(array $v): string {
                 return $v['TABLE_NAME'];
             })
             ->pluck('TABLE_COMMENT')
@@ -59,7 +59,7 @@ 
                      WHERE
                         (TABLE_SCHEMA = ? OR REFERENCED_TABLE_SCHEMA = ?) AND
                         TABLE_NAME IS NOT NULL AND REFERENCED_TABLE_NAME IS NOT NULL",
-                    [ $main, $main ]
+                    [$main, $main]
                 )
             )->toArray();
             foreach ($col as $row) {
@@ -69,8 +69,8 @@ 
                 if ($row['REFERENCED_TABLE_SCHEMA'] !== $main) {
                     $additional[] = $row['REFERENCED_TABLE_SCHEMA'];
                 }
-                $relationsT[$row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME']][] = $row;
-                $relationsR[$row['REFERENCED_TABLE_SCHEMA'] . '.' . $row['REFERENCED_TABLE_NAME']][] = $row;
+                $relationsT[$row['TABLE_SCHEMA'].'.'.$row['TABLE_NAME']][] = $row;
+                $relationsR[$row['REFERENCED_TABLE_SCHEMA'].'.'.$row['REFERENCED_TABLE_NAME']][] = $row;
             }
             foreach (array_filter(array_unique($additional)) as $s) {
                 $col = Collection::from(
@@ -80,12 +80,12 @@ 
                         WHERE
                             TABLE_SCHEMA = ? AND REFERENCED_TABLE_SCHEMA = ? AND
                             TABLE_NAME IS NOT NULL AND REFERENCED_TABLE_NAME IS NOT NULL",
-                        [ $s, $s ]
+                        [$s, $s]
                     )
                 )->toArray();
                 foreach ($col as $row) {
-                    $relationsT[$row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME']][] = $row;
-                    $relationsR[$row['REFERENCED_TABLE_SCHEMA'] . '.' . $row['REFERENCED_TABLE_NAME']][] = $row;
+                    $relationsT[$row['TABLE_SCHEMA'].'.'.$row['TABLE_NAME']][] = $row;
+                    $relationsR[$row['REFERENCED_TABLE_SCHEMA'].'.'.$row['REFERENCED_TABLE_NAME']][] = $row;
                 }
             }
         }
@@ -94,14 +94,14 @@ 
         if (!count($columns)) {
             throw new DBException('Table not found by name');
         }
-        $tables[$schema . '.' . $table] = $definition = (new Table($table, $schema))
+        $tables[$schema.'.'.$table] = $definition = (new Table($table, $schema))
             ->addColumns(
                 $columns
                     ->clone()
-                    ->mapKey(function (array $v): string {
+                    ->mapKey(function(array $v): string {
                         return $v['Field'];
                     })
-                    ->map(function (array $v): array {
+                    ->map(function(array $v): array {
                         $v['length'] = null;
                         if (!isset($v['Type'])) {
                             return $v;
@@ -123,7 +123,7 @@ 
                             default:
                                 if (strpos($type, 'char') !== false && strpos($type, '(') !== false) {
                                     // extract length from varchar
-                                    $v['length'] = (int)explode(')', explode('(', $type)[1])[0];
+                                    $v['length'] = (int) explode(')', explode('(', $type)[1])[0];
                                     $v['length'] = $v['length'] > 0 ? $v['length'] : null;
                                 }
                                 break;
@@ -135,7 +135,7 @@ 
             ->setPrimaryKey(
                 $columns
                     ->clone()
-                    ->filter(function (array $v): bool {
+                    ->filter(function(array $v): bool {
                         return $v['Key'] === 'PRI';
                     })
                     ->pluck('Field')
@@ -149,8 +149,8 @@ 
             // assuming current table is on the "one" end having "many" records in the referencing table
             // resulting in a "hasMany" or "manyToMany" relationship (if a pivot table is detected)
             $relations = [];
-            foreach ($relationsR[$schema . '.' . $table] ?? [] as $relation) {
-                $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_SCHEMA'] . '.' . $relation['TABLE_NAME'];
+            foreach ($relationsR[$schema.'.'.$table] ?? [] as $relation) {
+                $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_SCHEMA'].'.'.$relation['TABLE_NAME'];
                 $relations[$relation['CONSTRAINT_NAME']]['keymap'][$relation['REFERENCED_COLUMN_NAME']] =
                     $relation['COLUMN_NAME'];
             }
@@ -166,10 +166,10 @@ 
                 $usedcol = [];
                 if (count($columns)) {
                     foreach (Collection::from($relationsT[$data['table']] ?? [])
-                        ->filter(function (array $v) use ($columns): bool {
+                        ->filter(function(array $v) use ($columns): bool {
                             return in_array($v['COLUMN_NAME'], $columns);
                         })
-                        ->map(function (array $v): array {
+                        ->map(function(array $v): array {
                             $new = [];
                             foreach ($v as $kk => $vv) {
                                 $new[strtoupper($kk)] = $vv;
@@ -177,7 +177,7 @@ 
                             return $new;
                         }) as $relation
                     ) {
-                        $foreign[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'] . '.' . $relation['REFERENCED_TABLE_NAME'];
+                        $foreign[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'].'.'.$relation['REFERENCED_TABLE_NAME'];
                         $foreign[$relation['CONSTRAINT_NAME']]['keymap'][$relation['COLUMN_NAME']] =
                             $relation['REFERENCED_COLUMN_NAME'];
                         $usedcol[] = $relation['COLUMN_NAME'];
@@ -193,7 +193,7 @@ 
                     $orig = $relname;
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $orig . '_' . (++ $cntr);
+                        $relname = $orig.'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -214,7 +214,7 @@ 
                     $orig = $relname;
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $orig . '_' . (++ $cntr);
+                        $relname = $orig.'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -230,8 +230,8 @@ 
             // assuming current table is linked to "one" record in the referenced table
             // resulting in a "belongsTo" relationship
             $relations = [];
-            foreach (Collection::from($relationsT[$schema . '.' . $table] ?? [])
-                ->map(function (array $v): array {
+            foreach (Collection::from($relationsT[$schema.'.'.$table] ?? [])
+                ->map(function(array $v): array {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -239,7 +239,7 @@ 
                     return $new;
                 }) as $relation
             ) {
-                $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'] . '.' . $relation['REFERENCED_TABLE_NAME'];
+                $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'].'.'.$relation['REFERENCED_TABLE_NAME'];
                 $relations[$relation['CONSTRAINT_NAME']]['keymap'][$relation['COLUMN_NAME']] =
                     $relation['REFERENCED_COLUMN_NAME'];
             }
@@ -252,7 +252,7 @@ 
                 $orig = $relname;
                 $cntr = 1;
                 while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                    $relname = $orig . '_' . (++ $cntr);
+                    $relname = $orig.'_'.(++$cntr);
                 }
                 $definition->addRelation(
                     new TableRelation(
@@ -273,23 +273,23 @@ 
                 "SELECT table_name FROM information_schema.tables where table_schema = ?",
                 [$this->connection['opts']['schema'] ?? $this->connection['name']]
             ))
-            ->map(function (array $v): array {
+            ->map(function(array $v): array {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
                 }
                 return $new;
             })
-            ->mapKey(function (array $v): string {
+            ->mapKey(function(array $v): string {
                 return strtolower($v['TABLE_NAME']);
             })
             ->pluck('TABLE_NAME')
-            ->map(function (string $v): Table {
+            ->map(function(string $v): Table {
                 return $this->table($v)->toLowerCase();
             })
             ->toArray();
         foreach (array_keys($tables) as $k) {
-            $tables[($this->connection['opts']['schema'] ?? $this->connection['name']) . '.' . $k] = &$tables[$k];
+            $tables[($this->connection['opts']['schema'] ?? $this->connection['name']).'.'.$k] = &$tables[$k];
         }
         return $tables;
     }