vakata / database

src/driver/mysql/Result.php

Spacing +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
                 if ($temp) {
                     $temp = $temp->fetch_fields();
                     if ($temp) {
-                        $columns = array_map(function ($v) {
+                        $columns = array_map(function($v) {
                             return $v->name;
                         }, $temp);
                     }
@@ -51,7 +51,7 @@ 
     }
     public function affected() : int
     {
-        return (int)$this->statement->affected_rows;
+        return (int) $this->statement->affected_rows;
     }
     public function insertID(?string $sequence = null): mixed
     {
@@ -73,7 +73,7 @@ 
     }
     public function current(): mixed
     {
-        return $this->nativeDriver ? $this->last : array_map(function ($v) {
+        return $this->nativeDriver ? $this->last : array_map(function($v) {
             return $v;
         }, $this->row);
     }
@@ -92,8 +92,8 @@ 
     }
     public function next(): void
     {
-        $this->fetched ++;
-        $this->last = $this->nativeDriver ? ($this->result->fetch_assoc()?:null) : $this->statement->fetch();
+        $this->fetched++;
+        $this->last = $this->nativeDriver ? ($this->result->fetch_assoc() ?: null) : $this->statement->fetch();
     }
     public function valid(): bool
     {

src/driver/oracle/Result.php

Spacing +10 added lines, -10 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)) {
             $this->cast();
         }
@@ -78,23 +78,23 @@ 
     protected function cast(): void
     {
         if (!count($this->types)) {
-            foreach (array_keys($this->last??[]) as $k => $v) {
+            foreach (array_keys($this->last ?? []) as $k => $v) {
                 $this->types[$v] = \oci_field_type($this->statement, $k + 1);
                 if ($this->types[$v] === 'NUMBER') {
                     $scale = \oci_field_scale($this->statement, $k + 1);
                     $precision = \oci_field_precision($this->statement, $k + 1);
                     // true float
-                    if ((int)$scale === -127 && (int)$precision !== 0) {
+                    if ((int) $scale === -127 && (int) $precision !== 0) {
                         $this->types[$v] = 'FLOAT';
                     }
                     // TODO: decimal
-                    if ((int)$scale > 0) {
+                    if ((int) $scale > 0) {
                         $this->types[$v] = 'DECIMAL';
                     }
                 }
             }
         }
-        foreach ($this->last??[] as $k => $v) {
+        foreach ($this->last ?? [] as $k => $v) {
             if (!isset($this->types[$k])) {
                 continue;
             }
@@ -109,10 +109,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/schema/Table.php

Spacing +9 added lines, -9 removed lines

@@ -84,10 +84,10 @@ 
      * @param  array|string        $column either a single column name or an array of column names
      * @return  static
      */
-    public function setPrimaryKey(array|string $column): static
+    public function setPrimaryKey(array | string $column): static
     {
         if (!is_array($column)) {
-            $column = [ $column ];
+            $column = [$column];
         }
         $this->data['primary'] = array_values($column);
         return $this;
@@ -114,7 +114,7 @@ 
      */
     public function getFullName(): string
     {
-        return ($this->data['schema'] ? $this->data['schema'] . '.' : '') . $this->data['name'];
+        return ($this->data['schema'] ? $this->data['schema'].'.' : '').$this->data['name'];
     }
     /**
      * Get a column definition
@@ -171,7 +171,7 @@ 
     public function hasOne(
         Table $toTable,
         ?string $name = null,
-        string|array|null $toTableColumn = null,
+        string | array | null $toTableColumn = null,
         ?string $sql = null,
         array $par = []
     ) : static {
@@ -199,7 +199,7 @@ 
         }
 
         if (!isset($name)) {
-            $name = $toTable->getName() . '_' . implode('_', array_keys($keymap));
+            $name = $toTable->getName().'_'.implode('_', array_keys($keymap));
         }
         $this->addRelation(new TableRelation(
             $this,
@@ -226,7 +226,7 @@ 
     public function hasMany(
         Table $toTable,
         ?string $name = null,
-        string|array|null $toTableColumn = null,
+        string | array | null $toTableColumn = null,
         ?string $sql = null,
         array $par = []
     ): static {
@@ -281,7 +281,7 @@ 
     public function belongsTo(
         Table $toTable,
         ?string $name = null,
-        string|array|null $localColumn = null,
+        string | array | null $localColumn = null,
         ?string $sql = null,
         array $par = []
     ): static {
@@ -337,8 +337,8 @@ 
         Table $toTable,
         Table $pivot,
         ?string $name = null,
-        string|array|null $toTableColumn = null,
-        string|array|null $localColumn = null
+        string | array | null $toTableColumn = null,
+        string | array | null $localColumn = null
     ): static {
         $pivotColumns = $pivot->getColumns();
 

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 +29 added lines, -31 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');
         }
@@ -130,7 +130,7 @@ 
         $map = [];
         $sql = preg_replace_callback(
             '(\:[a-z_][a-z0-9_]+)i',
-            function ($matches) use (&$map, $par) {
+            function($matches) use (&$map, $par) {
                 $key = substr($matches[0], 1);
                 $map[] = $key;
                 return isset($par) && isset($par[$key]) && is_array($par[$key]) ? '??' : '?';
@@ -147,7 +147,7 @@ 
         $new = '';
         $par = array_values($par);
         if (substr_count($sql, '?') === 2 && !is_array($par[0])) {
-            $par = [ $par ];
+            $par = [$par];
         }
         $parts = explode('??', $sql);
         $index = 0;
@@ -157,7 +157,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);
@@ -165,7 +165,7 @@ 
                 $new .= implode(',', array_fill(0, count($params), '?'));
             }
         }
-        return [ $new, $par ];
+        return [$new, $par];
     }
     /**
      * Run a query (prepare & execute).
@@ -182,7 +182,7 @@ 
             $sql = $tmp['sql'];
             $ord = [];
             foreach ($tmp['map'] as $key) {
-                $ord[] = $par[$key] ?? throw new DBException('Missing param ' . $key);
+                $ord[] = $par[$key] ?? throw new DBException('Missing param '.$key);
             }
             $par = $ord;
         }
@@ -223,7 +223,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;
@@ -232,18 +232,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;
             });
         }
@@ -360,8 +360,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
@@ -471,11 +470,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);
         }
@@ -484,14 +483,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;
     }
@@ -502,11 +501,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
     {
@@ -542,12 +540,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/pdo/Statement.php

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
         if (isset($this->map)) {
             $par = [];
             foreach ($this->map as $key) {
-                $par[] = $data[$key] ?? throw new DBException('Missing param ' . $key);
+                $par[] = $data[$key] ?? throw new DBException('Missing param '.$key);
             }
             $data = $par;
         }
@@ -34,28 +34,28 @@ 
         foreach ($data as $i => $v) {
             switch (gettype($v)) {
                 case 'boolean':
-                    $this->statement->bindValue($i+1, $v, \PDO::PARAM_BOOL);
+                    $this->statement->bindValue($i + 1, $v, \PDO::PARAM_BOOL);
                     break;
                 case 'integer':
-                    $this->statement->bindValue($i+1, $v, \PDO::PARAM_INT);
+                    $this->statement->bindValue($i + 1, $v, \PDO::PARAM_INT);
                     break;
                 case 'NULL':
-                    $this->statement->bindValue($i+1, $v, \PDO::PARAM_NULL);
+                    $this->statement->bindValue($i + 1, $v, \PDO::PARAM_NULL);
                     break;
                 case 'double':
-                    $this->statement->bindValue($i+1, $v);
+                    $this->statement->bindValue($i + 1, $v);
                     break;
                 default:
                     // keep in mind oracle needs a transaction when inserting LOBs, aside from the specific syntax:
                     // INSERT INTO table (column, lobcolumn) VALUES (?, ?, EMPTY_BLOB()) RETURNING lobcolumn INTO ?
                     if (is_resource($v) && get_resource_type($v) === 'stream') {
-                        $this->statement->bindParam($i+1, $v, \PDO::PARAM_LOB);
+                        $this->statement->bindParam($i + 1, $v, \PDO::PARAM_LOB);
                         break;
                     }
                     if (!is_string($data[$i])) {
                         $data[$i] = serialize($data[$i]);
                     }
-                    $this->statement->bindValue($i+1, $v);
+                    $this->statement->bindValue($i + 1, $v);
                     break;
             }
         }

src/driver/sphinx/Statement.php

Spacing +6 added lines, -6 removed lines

@@ -28,7 +28,7 @@ 
         if (isset($this->map)) {
             $par = [];
             foreach ($this->map as $key) {
-                $par[] = $data[$key] ?? throw new DBException('Missing param ' . $key);
+                $par[] = $data[$key] ?? throw new DBException('Missing param '.$key);
             }
             $data = $par;
         }
@@ -49,23 +49,23 @@ 
                             break;
                         case 'array':
                             $par = implode(',', $par);
-                            $par = "'" . $this->lnk->escape_string($par) . "'";
+                            $par = "'".$this->lnk->escape_string($par)."'";
                             break;
                         case 'object':
                             $par = serialize($par);
-                            $par = "'" . $this->lnk->escape_string($par) . "'";
+                            $par = "'".$this->lnk->escape_string($par)."'";
                             break;
                         case 'resource':
                             if (is_resource($par) && get_resource_type($par) === 'stream') {
                                 $par = stream_get_contents($par);
-                                $par = "'" . $this->lnk->escape_string($par) . "'";
+                                $par = "'".$this->lnk->escape_string($par)."'";
                             } else {
                                 $par = serialize($par);
-                                $par = "'" . $this->lnk->escape_string($par) . "'";
+                                $par = "'".$this->lnk->escape_string($par)."'";
                             }
                             break;
                         default:
-                            $par = "'" . $this->lnk->escape_string((string)$par) . "'";
+                            $par = "'".$this->lnk->escape_string((string) $par)."'";
                             break;
                     }
                     $sql .= $par;

src/driver/mysql/Statement.php

Spacing +9 added lines, -9 removed lines

@@ -31,7 +31,7 @@ 
         if (isset($this->map)) {
             $par = [];
             foreach ($this->map as $key) {
-                $par[] = $data[$key] ?? throw new DBException('Missing param ' . $key);
+                $par[] = $data[$key] ?? throw new DBException('Missing param '.$key);
             }
             $data = $par;
         }
@@ -86,7 +86,7 @@ 
             foreach ($lng as $index) {
                 if (is_resource($data[$index]) && get_resource_type($data[$index]) === 'stream') {
                     while (!feof($data[$index])) {
-                        $this->statement->send_long_data($index, (string)fread($data[$index], $lds));
+                        $this->statement->send_long_data($index, (string) fread($data[$index], $lds));
                     }
                 } else {
                     $data[$index] = str_split($data[$index], $lds);
@@ -106,24 +106,24 @@ 
             $res = false;
         }
         if (!$res) {
-            if ($log && (int)$this->driver->option('log_errors', 1)) {
+            if ($log && (int) $this->driver->option('log_errors', 1)) {
                 @file_put_contents(
                     $log,
-                    '--' . date('Y-m-d H:i:s') . ' ERROR: ' . $this->statement->error . "\r\n" .
-                    $this->sql . "\r\n" .
+                    '--'.date('Y-m-d H:i:s').' ERROR: '.$this->statement->error."\r\n".
+                    $this->sql."\r\n".
                     "\r\n",
                     FILE_APPEND
                 );
             }
-            throw new DBException('Prepared execute error: ' . $this->statement->error);
+            throw new DBException('Prepared execute error: '.$this->statement->error);
         }
         if ($log) {
             $tm = microtime(true) - $tm;
-            if ($tm >= (float)$this->driver->option('log_slow', 0)) {
+            if ($tm >= (float) $this->driver->option('log_slow', 0)) {
                 @file_put_contents(
                     $log,
-                    '--' . date('Y-m-d H:i:s') . ' ' . sprintf('%01.6f', $tm) . "s\r\n" .
-                    $this->sql . "\r\n" .
+                    '--'.date('Y-m-d H:i:s').' '.sprintf('%01.6f', $tm)."s\r\n".
+                    $this->sql."\r\n".
                     "\r\n",
                     FILE_APPEND
                 );

src/driver/odbc/Statement.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         if (isset($this->map)) {
             $par = [];
             foreach ($this->map as $key) {
-                $par[] = $data[$key] ?? throw new DBException('Missing param ' . $key);
+                $par[] = $data[$key] ?? throw new DBException('Missing param '.$key);
             }
             $data = $par;
         }