vakata / database

src/schema/Mapper.php

Spacing +18 added lines, -19 removed lines

@@ -26,7 +26,7 @@ 
      * @param class-string<T> $clss
      * @return void
      */
-    public function __construct(DBInterface $db, string|Table|null $table = '', string $clss = Entity::class)
+    public function __construct(DBInterface $db, string | Table | null $table = '', string $clss = Entity::class)
     {
         $this->db = $db;
         if (!$table) {
@@ -62,7 +62,7 @@ 
         $temp = [];
         foreach ($this->table->getPrimaryKey() as $column) {
             try {
-                $temp[(string)$column] = $entity->{$column} ?? null;
+                $temp[(string) $column] = $entity->{$column} ?? null;
                 /** @phpstan-ignore-next-line */
             } catch (\Throwable $ignore) {
             }
@@ -92,7 +92,7 @@ 
 
         // BEG: ugly hack to get relations changed directly on the object (not hydrated)
         $hack = [];
-        foreach ((array)$entity as $k => $v) {
+        foreach ((array) $entity as $k => $v) {
             $hack[$k[0] === "\0" ? substr($k, strrpos($k, "\0", 1) + 1) : $k] = $v;
         }
         $hack = $hack['changed'] ?? [];
@@ -103,7 +103,7 @@ 
         foreach ($columns as $column) {
             try {
                 if (in_array($column, $fetched) || array_key_exists($column, $hack) || $fetch) {
-                    $temp[(string)$column] = $entity->{$column};
+                    $temp[(string) $column] = $entity->{$column};
                 }
             } catch (\Throwable $ignore) {
             }
@@ -113,7 +113,7 @@ 
         foreach ($relations as $relation) {
             try {
                 if (array_key_exists($relation, $fetched) || array_key_exists($relation, $hack) || $fetch) {
-                    $temp[(string)$relation] = $entity->{$relation};
+                    $temp[(string) $relation] = $entity->{$relation};
                 }
             } catch (\Throwable $ignore) {
             }
@@ -152,10 +152,10 @@ 
         $temp = [];
         foreach ($this->table->getColumns() as $column) {
             if (array_key_exists($column, $data)) {
-                $temp[(string)$column] = $data[$column];
+                $temp[(string) $column] = $data[$column];
             }
             if ($empty) {
-                $temp[(string)$column] = null;
+                $temp[(string) $column] = null;
             }
         }
         $entity = $this->instance(
@@ -181,7 +181,7 @@ 
         $lazy = [];
         foreach ($this->table->getColumns() as $column) {
             if (!array_key_exists($column, $data)) {
-                $lazy[$column] = function ($entity) use ($column) {
+                $lazy[$column] = function($entity) use ($column) {
                     $query = $this->db->table($this->table->getFullName());
                     foreach ($this->id($entity) as $k => $v) {
                         $query->filter($k, $v);
@@ -204,7 +204,7 @@ 
     {
         $relations = [];
         foreach ($this->table->getRelations() as $name => $relation) {
-            $relations[$name] = function (
+            $relations[$name] = function(
                 $entity,
                 bool $queryOnly = false
             ) use (
@@ -218,10 +218,10 @@ 
                         return $this->objects[spl_object_hash($entity)][4][$name] = null;
                     }
                     $value = $relation->many ?
-                        Collection::from(array_map(function ($v) use ($mapper) {
+                        Collection::from(array_map(function($v) use ($mapper) {
                             return $mapper->entity($v);
                         }, $data[$name]))
-                            ->filter(function ($v) use ($mapper) {
+                            ->filter(function($v) use ($mapper) {
                                 return !$mapper->deleted($v);
                             }) :
                         ($mapper->deleted($data[$name]) ? null : $mapper->entity($data[$name]));
@@ -230,7 +230,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;
@@ -251,7 +251,7 @@ 
                     }
                     $pk = $this->id($entity);
                     foreach ($pk as $k => $v) {
-                        $query->filter($nm . '.' . $k, $v);
+                        $query->filter($nm.'.'.$k, $v);
                     }
                 } else {
                     $temp = $this->toArray($entity, array_keys($relation->keymap));
@@ -263,10 +263,9 @@ 
                     return $query;
                 }
                 $value = $relation->many ?
-                    $query->iterator() :
-                    ($query[0] ?? null);
+                    $query->iterator() : ($query[0] ?? null);
                 if ($value instanceof Collection) {
-                    $value->filter(function ($v) use ($mapper) {
+                    $value->filter(function($v) use ($mapper) {
                         return !$mapper->deleted($v);
                     });
                 } elseif (isset($value) && $mapper->deleted($value)) {
@@ -499,7 +498,7 @@ 
             }
         }
     }
-    public function exists(array|object $entity): bool
+    public function exists(array | object $entity): bool
     {
         if (is_array($entity)) {
             $primary = [];
@@ -512,7 +511,7 @@ 
         return isset($this->objects[spl_object_hash($entity)]) &&
             $this->objects[spl_object_hash($entity)] !== false;
     }
-    public function deleted(array|object $entity): bool
+    public function deleted(array | object $entity): bool
     {
         if (is_array($entity)) {
             $primary = [];
@@ -584,7 +583,7 @@ 
         return array_filter(
             array_values(
                 array_map(
-                    function ($v) {
+                    function($v) {
                         return $v[1] ?? null;
                     },
                     $this->objects

src/schema/TableQueryMapped.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
 
     public function __construct(
         DBInterface $db,
-        Table|string $table,
+        Table | string $table,
         bool $findRelations = false,
         ?MapperInterface $mapper = null
     ) {
@@ -34,7 +34,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);
             })
             ->values();

src/DB.php

Spacing +27 added lines, -29 removed lines

@@ -74,19 +74,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');
         }
@@ -124,7 +124,7 @@ 
         $new = '';
         $par = array_values($par);
         if (substr_count($sql, '?') === 2 && !is_array($par[0])) {
-            $par = [ $par ];
+            $par = [$par];
         }
         $parts = explode('??', $sql);
         $index = 0;
@@ -134,7 +134,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);
@@ -142,7 +142,7 @@ 
                 $new .= implode(',', array_fill(0, count($params), '?'));
             }
         }
-        return [ $new, $par ];
+        return [$new, $par];
     }
     /**
      * Run a query (prepare & execute).
@@ -191,7 +191,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;
@@ -200,18 +200,18 @@ 
             });
         }
         if ($key !== null) {
-            $coll->mapKey(function ($v) use ($key): int|string {
+            $coll->mapKey(function($v) use ($key): int | string {
                 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;
             });
         }
@@ -328,8 +328,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
@@ -439,11 +438,11 @@ 
      * @param class-string<T>|Table|string $table
      * @return ($table is class-string ? MapperInterface<T> : MapperInterface<Entity>)
      */
-    public function getMapper(Table|string $table): MapperInterface
+    public function getMapper(Table | string $table): MapperInterface
     {
         if (is_string($table)) {
-            if (isset($this->mappers['::' . $table])) {
-                return $this->mappers['::' . $table];
+            if (isset($this->mappers['::'.$table])) {
+                return $this->mappers['::'.$table];
             }
             $table = $this->definition($table);
         }
@@ -452,14 +451,14 @@ 
         }
         return $this->mappers[$table->getFullName()] = new Mapper($this, $table);
     }
-    public function setMapper(Table|string $table, MapperInterface $mapper, ?string $class = null): static
+    public function setMapper(Table | string $table, MapperInterface $mapper, ?string $class = null): static
     {
         if (is_string($table)) {
             $table = $this->definition($table);
         }
         $this->mappers[$table->getFullName()] = $mapper;
         if (isset($class)) {
-            $this->mappers['::' . $class] = $mapper;
+            $this->mappers['::'.$class] = $mapper;
         }
         return $this;
     }
@@ -470,11 +469,10 @@ 
     ): TableQueryMapped {
         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
     {
@@ -510,12 +508,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/DBInterface.php

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
      * @param class-string<T>|Table|string $table
      * @return ($table is class-string ? MapperInterface<T> : MapperInterface<Entity>)
      */
-    public function getMapper(Table|string $table): MapperInterface;
+    public function getMapper(Table | string $table): MapperInterface;
     /*
      * @template T of Entity
      * @param Table|string $table
@@ -126,7 +126,7 @@ 
      * @param null|class-string<T> $class
      * @return static 
      */
-    public function setMapper(Table|string $table, MapperInterface $mapper, ?string $class = null): static;
+    public function setMapper(Table | string $table, MapperInterface $mapper, ?string $class = null): static;
     public function tableMapped(
         string $table,
         bool $findRelations = false,

src/schema/MapperInterface.php

Spacing +2 added lines, -2 removed lines

@@ -58,12 +58,12 @@
      * @param array|T $entity
      * @return bool
      */
-    public function deleted(array|object $entity): bool;
+    public function deleted(array | object $entity): bool;
     /**
      * @param array|T $entity
      * @return bool
      */
-    public function exists(array|object $entity): bool;
+    public function exists(array | object $entity): bool;
     /**
      * @return array<int,T>
      */