vakata / database

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');
         }
@@ -119,7 +119,7 @@ 
         $new = '';
         $par = array_values($par);
         if (substr_count($sql, '?') === 2 && !is_array($par[0])) {
-            $par = [ $par ];
+            $par = [$par];
         }
         $parts = explode('??', $sql);
         $index = 0;
@@ -129,7 +129,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);
@@ -137,7 +137,7 @@ 
                 $new .= implode(',', array_fill(0, count($params), '?'));
             }
         }
-        return [ $new, $par ];
+        return [$new, $par];
     }
     /**
      * Run a query (prepare & execute).
@@ -186,7 +186,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;
@@ -195,18 +195,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;
             });
         }
@@ -323,8 +323,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
@@ -369,7 +368,7 @@ 
     {
         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);
@@ -379,7 +378,7 @@ 
         }
         return $this->mappers[$table->getFullName()] = new Mapper($this, $table);
     }
-    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);
@@ -395,11 +394,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
     {
@@ -435,12 +433,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/TableQueryMapped.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 
     public function __construct(
         DBInterface $db,
-        Table|string $table,
+        Table | string $table,
         bool $findRelations = false,
         ?MapperInterface $mapper = null
     ) {
@@ -31,7 +31,7 @@ 
     public function iterator(array $fields = null, array $collectionKey = null): Collection
     {
         return Collection::from(parent::iterator($fields, $collectionKey))
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->mapper->entity($v);
             });
     }

src/schema/Mapper.php

Spacing +6 added lines, -7 removed lines

@@ -80,7 +80,7 @@ 
         $lazy = [];
         foreach ($this->table->getColumns() as $column) {
             if (!array_key_exists($column, $temp)) {
-                $lazy[$column] = function () use ($primary, $column) {
+                $lazy[$column] = function() use ($primary, $column) {
                     $query = $this->db->table($this->table->getFullName());
                     foreach ($primary as $k => $v) {
                         $query->filter($k, $v);
@@ -92,7 +92,7 @@ 
         $relations = [];
         foreach ($this->table->getRelations() as $name => $relation) {
             $mapper = $this->db->getMapper($relation->table);
-            $relations[$name] = function (bool $queryOnly = false) use (
+            $relations[$name] = function(bool $queryOnly = false) use (
                 $name,
                 $relation,
                 $mapper,
@@ -100,14 +100,14 @@ 
             ) {
                 if (!$queryOnly && isset($data[$name])) {
                     return $relation->many ?
-                        array_map(function ($v) use ($mapper) {
+                        array_map(function($v) use ($mapper) {
                             return $mapper->entity($v);
                         }, $data[$name]) :
                         $mapper->entity($data[$name]);
                 }
                 $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;
@@ -127,7 +127,7 @@ 
                         );
                     }
                     foreach ($this->table->getPrimaryKey() as $v) {
-                        $query->filter($nm . '.' . $v, $data[$v] ?? null);
+                        $query->filter($nm.'.'.$v, $data[$v] ?? null);
                     }
                 } else {
                     foreach ($relation->keymap as $k => $v) {
@@ -138,8 +138,7 @@ 
                     return $query;
                 }
                 return $relation->many ?
-                    $query->iterator() :
-                    ($query[0] ?? null);
+                    $query->iterator() : ($query[0] ?? null);
             };
         }
         $entity = $this->instance($temp, $lazy, $relations);