vakata / database

src/driver/sqlite/Schema.php

Spacing +22 added lines, -22 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;
@@ -53,18 +53,18 @@ 
                             ]
                         )
                     );
-                    $relationsT['main.' . $row['table']][] = $row;
-                    $relationsR['main.' . $row['referenced_table']][] = $row;
+                    $relationsT['main.'.$row['table']][] = $row;
+                    $relationsR['main.'.$row['referenced_table']][] = $row;
                 }
             }
         }
 
         $columns = Collection::from($this
             ->query("PRAGMA table_info(".$table.")"))
-            ->mapKey(function ($v) {
+            ->mapKey(function($v) {
                 return $v['name'];
             })
-            ->map(function ($v) {
+            ->map(function($v) {
                 $v['length'] = null;
                 if (!isset($v['type'])) {
                     return $v;
@@ -74,7 +74,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;
@@ -83,15 +83,15 @@ 
             })
             ->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]));
         }
         $primary = [];
         foreach ($columns as $column) {
-            if ((int)$column['pk']) {
+            if ((int) $column['pk']) {
                 $primary[] = $column['name'];
             }
         }
-        $tables[$schema . '.' .$table] = $definition = (new Table($table, $schema))
+        $tables[$schema.'.'.$table] = $definition = (new Table($table, $schema))
             ->addColumns($columns)
             ->setPrimaryKey($primary)
             ->setComment('');
@@ -101,8 +101,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 $k => $relation) {
-                $relations[$relation['constraint_name']]['table'] = 'main.' . $relation['table'];
+            foreach ($relationsR[$schema.'.'.$table] ?? [] as $k => $relation) {
+                $relations[$relation['constraint_name']]['table'] = 'main.'.$relation['table'];
                 $relations[$relation['constraint_name']]['keymap'][$relation['to']] = $relation['from'];
             }
             foreach ($relations as $data) {
@@ -117,11 +117,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['from'], $columns);
                         }) as $relation
                     ) {
-                        $foreign[$relation['constraint_name']]['table'] = 'main.' .
+                        $foreign[$relation['constraint_name']]['table'] = 'main.'.
                             $relation['referenced_table'];
                         $foreign[$relation['constraint_name']]['keymap'][$relation['from']] = $relation['to'];
                         $usedcol[] = $relation['from'];
@@ -140,7 +140,7 @@ 
                         $definition->getName() == $relname ||
                         $definition->getColumn($relname)
                     ) {
-                        $relname = $orig . '_' . (++ $cntr);
+                        $relname = $orig.'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -164,7 +164,7 @@ 
                         $definition->getName() == $relname ||
                         $definition->getColumn($relname)
                     ) {
-                        $relname = $orig . '_' . (++ $cntr);
+                        $relname = $orig.'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -180,8 +180,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'] = 'main.' . $relation['referenced_table'];
+            foreach ($relationsT[$schema.'.'.$table] ?? [] as $relation) {
+                $relations[$relation['constraint_name']]['table'] = 'main.'.$relation['referenced_table'];
                 $relations[$relation['constraint_name']]['keymap'][$relation['from']] = $relation['to'];
             }
             foreach ($relations as $name => $data) {
@@ -196,7 +196,7 @@ 
                     $definition->getName() == $relname ||
                     $definition->getColumn($relname)
                 ) {
-                    $relname = $orig . '_' . (++ $cntr);
+                    $relname = $orig.'_'.(++$cntr);
                 }
                 $definition->addRelation(
                     new TableRelation(
@@ -217,9 +217,9 @@ 
                 "SELECT tbl_name
                  FROM sqlite_schema
                  WHERE (type = ? OR type = ?) AND tbl_name NOT LIKE 'sqlite_%';",
-                [ 'table', 'view' ]
+                ['table', 'view']
             ))
-            ->mapKey(function ($v) {
+            ->mapKey(function($v) {
                 return strtolower($v['tbl_name']);
             })
             ->pluck('tbl_name')
@@ -228,7 +228,7 @@ 
             $tables[$k] = $this->table($v, true, array_keys($tables))->toLowerCase();
         }
         foreach (array_keys($tables) as $k) {
-            $tables[($this->connection['opts']['schema'] ?? 'main') . '.' . $k] = &$tables[$k];
+            $tables[($this->connection['opts']['schema'] ?? 'main').'.'.$k] = &$tables[$k];
         }
         return $tables;
     }

src/schema/TableQueryMapped.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
     public function __construct(
         DBInterface $db,
-        Table|string $table,
+        Table | string $table,
         bool $findRelations = false,
         ?MapperInterface $mapper = null
     ) {

src/DBInterface.php

Spacing +2 added lines, -2 removed lines

@@ -48,8 +48,8 @@
     public function getSchema(): Schema;
     public function setSchema(Schema $schema): static;
     public function table(string $table, bool $findRelations = false): TableQuery;
-    public function getMapper(Table|string $table): MapperInterface;
-    public function setMapper(Table|string $table, MapperInterface $mapper): static;
+    public function getMapper(Table | string $table): MapperInterface;
+    public function setMapper(Table | string $table, MapperInterface $mapper): static;
     public function tableMapped(
         string $table,
         bool $findRelations = false,

src/DB.php

Spacing +24 added lines, -26 removed lines

@@ -69,19 +69,19 @@ 
                 ];
             }
         }
-        $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');
         }
@@ -121,7 +121,7 @@ 
         $new = '';
         $par = array_values($par);
         if (substr_count($sql, '?') === 2 && !is_array($par[0])) {
-            $par = [ $par ];
+            $par = [$par];
         }
         $parts = explode('??', $sql);
         $index = 0;
@@ -131,7 +131,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);
@@ -139,7 +139,7 @@ 
                 $new .= implode(',', array_fill(0, count($params), '?'));
             }
         }
-        return [ $new, $par ];
+        return [$new, $par];
     }
     /**
      * Run a query (prepare & execute).
@@ -188,7 +188,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;
@@ -197,18 +197,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;
             });
         }
@@ -317,8 +317,7 @@ 
     public function definition(string $table, bool $detectRelations = true) : Table
     {
         return isset($this->schema) ?
-            $this->schema->getTable($table) :
-            $this->driver->table($table, $detectRelations);
+            $this->schema->getTable($table) : $this->driver->table($table, $detectRelations);
     }
 
     public function hasSchema(): bool
@@ -363,14 +362,14 @@ 
     {
         return new TableQuery($this, $this->definition($table), $findRelations);
     }
-    public function getMapper(Table|string $table): MapperInterface
+    public function getMapper(Table | string $table): MapperInterface
     {
         if (is_string($table)) {
             $table = $this->definition($table);
         }
         return $this->mappers[$table->getFullName()] ?? $this->mappers['*'];
     }
-    public function setMapper(Table|string $table, MapperInterface $mapper): static
+    public function setMapper(Table | string $table, MapperInterface $mapper): static
     {
         if (is_string($table)) {
             $table = $this->definition($table);
@@ -386,11 +385,10 @@ 
     {
         return new TableQueryMapped($this, $this->definition($table), $findRelations, $mapper);
     }
-    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, $args[2] ?? null) :
-            $this->table($method, $args[1] ?? false);
+            $this->tableMapped($method, $args[1] ?? false, $args[2] ?? null) : $this->table($method, $args[1] ?? false);
     }
     public function findRelation(string $start, string $end): array
     {
@@ -426,12 +424,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/schema/Mapper.php

Spacing +7 added lines, -8 removed lines

@@ -64,7 +64,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);
             });
     }
@@ -72,7 +72,7 @@ 
     {
         $query = $this->db->tableMapped($relation->table->getFullName());
         if ($relation->sql) {
-            $query->where($relation->sql, $relation->par?:[]);
+            $query->where($relation->sql, $relation->par ?: []);
         }
         if ($relation->pivot) {
             $nm = null;
@@ -92,7 +92,7 @@ 
                 );
             }
             foreach ($definition->getPrimaryKey() as $v) {
-                $query->filter($nm . '.' . $v, $entity->{$v} ?? null);
+                $query->filter($nm.'.'.$v, $entity->{$v} ?? null);
             }
         } else {
             foreach ($relation->keymap as $k => $v) {
@@ -181,7 +181,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);
@@ -196,12 +196,12 @@ 
                 $name,
                 array_key_exists($name, $data) && isset($data[$name]) ?
                     ($relation->many ?
-                        array_map(function ($v) use ($relation, $mapper) {
+                        array_map(function($v) use ($relation, $mapper) {
                             return $mapper->entity($relation->table, $v);
                         }, $data[$name]) :
                         $mapper->entity($relation->table, $data[$name])
                     ) :
-                    function (
+                    function(
                         array $columns = null,
                         string $order = null,
                         bool $desc = false
@@ -218,8 +218,7 @@ 
                             $query->sort($order, $desc);
                         }
                         return $relation->many ?
-                            $query->iterator() :
-                            $query[0];
+                            $query->iterator() : $query[0];
                     }
             );
         }