vakata / database

src/driver/postgre/Result.php

Spacing +8 added lines, -9 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)) {
             $this->cast();
         }
@@ -90,11 +89,11 @@ 
     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] = \pg_field_type($this->statement, $k);
             }
         }
-        foreach ($this->last??[] as $k => $v) {
+        foreach ($this->last ?? [] as $k => $v) {
             if (is_null($v) || !isset($this->types[$k])) {
                 continue;
             }
@@ -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;
                     break;
                 case 'money':
                 case 'numeric':

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')
@@ -61,7 +61,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) {
@@ -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(
@@ -84,12 +84,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;
                 }
             }
         }
@@ -98,14 +98,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;
@@ -127,7 +127,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;
@@ -139,7 +139,7 @@ 
             ->setPrimaryKey(
                 $columns
                     ->clone()
-                    ->filter(function (array $v): bool {
+                    ->filter(function(array $v): bool {
                         return $v['Key'] === 'PRI';
                     })
                     ->pluck('Field')
@@ -153,8 +153,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'] . '.' .
+            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'];
@@ -171,10 +171,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;
@@ -182,7 +182,7 @@ 
                             return $new;
                         }) as $relation
                     ) {
-                        $foreign[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'] . '.' .
+                        $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'];
@@ -199,7 +199,7 @@ 
                     $orig = $relname;
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $orig . '_' . (++ $cntr);
+                        $relname = $orig.'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -220,7 +220,7 @@ 
                     $orig = $relname;
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $orig . '_' . (++ $cntr);
+                        $relname = $orig.'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -236,8 +236,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;
@@ -245,7 +245,7 @@ 
                     return $new;
                 }) as $relation
             ) {
-                $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'] . '.' .
+                $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'];
@@ -259,7 +259,7 @@ 
                 $orig = $relname;
                 $cntr = 1;
                 while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                    $relname = $orig . '_' . (++ $cntr);
+                    $relname = $orig.'_'.(++$cntr);
                 }
                 $definition->addRelation(
                     new TableRelation(
@@ -280,23 +280,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;
     }

src/Schema.php

Spacing +4 added lines, -4 removed lines

@@ -64,13 +64,13 @@ 
     
     public function toArray(): array
     {
-        return array_map(function ($table) {
+        return 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(),
@@ -81,9 +81,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();

src/driver/postgre/Statement.php

Spacing +12 added lines, -14 removed lines

@@ -23,17 +23,17 @@ 
         if (strpos(strtolower($statement), 'prepare') === 0) {
             $this->drv->raw($this->statement);
             if (!isset($this->name)) {
-                $this->name = trim((preg_split('(\s+)', trim($this->statement))?:[])[1]??'', '"');
+                $this->name = trim((preg_split('(\s+)', trim($this->statement)) ?: [])[1] ?? '', '"');
             }
         } elseif ($this->name !== null) {
             $temp = \pg_prepare($this->driver, $this->name, $this->statement);
             if (!$temp) {
                 $log = $this->drv->option('log_file');
-                if ($log && (int)$this->drv->option('log_errors', 1)) {
+                if ($log && (int) $this->drv->option('log_errors', 1)) {
                     @file_put_contents(
                         $log,
-                        '--' . date('Y-m-d H:i:s') . ' ERROR PREPARING: ' . \pg_last_error($this->driver) . "\r\n" .
-                        $this->statement . "\r\n" .
+                        '--'.date('Y-m-d H:i:s').' ERROR PREPARING: '.\pg_last_error($this->driver)."\r\n".
+                        $this->statement."\r\n".
                         "\r\n",
                         FILE_APPEND
                     );
@@ -62,22 +62,20 @@ 
         try {
             if ($this->name !== null) {
                 $temp = (is_array($data) && count($data)) ?
-                    \pg_execute($this->driver, $this->name, $data) :
-                    \pg_execute($this->driver, $this->name, array());
+                    \pg_execute($this->driver, $this->name, $data) : \pg_execute($this->driver, $this->name, array());
             } else {
                 $temp = (is_array($data) && count($data)) ?
-                    \pg_query_params($this->driver, $this->statement, $data) :
-                    \pg_query_params($this->driver, $this->statement, array());
+                    \pg_query_params($this->driver, $this->statement, $data) : \pg_query_params($this->driver, $this->statement, array());
             }
         } catch (\Exception $e) {
             $temp = false;
         }
         if (!$temp) {
-            if ($log && (int)$this->drv->option('log_errors', 1)) {
+            if ($log && (int) $this->drv->option('log_errors', 1)) {
                 @file_put_contents(
                     $log,
-                    '--' . date('Y-m-d H:i:s') . ' ERROR: ' . \pg_last_error($this->driver) . "\r\n" .
-                    $this->statement . "\r\n" .
+                    '--'.date('Y-m-d H:i:s').' ERROR: '.\pg_last_error($this->driver)."\r\n".
+                    $this->statement."\r\n".
                     "\r\n",
                     FILE_APPEND
                 );
@@ -86,11 +84,11 @@ 
         }
         if ($log) {
             $tm = microtime(true) - $tm;
-            if ($tm >= (float)$this->drv->option('log_slow', 0)) {
+            if ($tm >= (float) $this->drv->option('log_slow', 0)) {
                 @file_put_contents(
                     $log,
-                    '--' . date('Y-m-d H:i:s') . ' ' . sprintf('%01.6f', $tm) . "s\r\n" .
-                    $this->statement . "\r\n" .
+                    '--'.date('Y-m-d H:i:s').' '.sprintf('%01.6f', $tm)."s\r\n".
+                    $this->statement."\r\n".
                     "\r\n",
                     FILE_APPEND
                 );

src/driver/mysql/Statement.php

Spacing +8 added lines, -8 removed lines

@@ -77,7 +77,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);
@@ -97,24 +97,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/sqlite/Driver.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         if ($this->lnk === null) {
             try {
                 $this->lnk = new \SQLite3($this->connection['name']);
-                $this->lnk->exec('PRAGMA encoding = "'.$this->option('charset', 'utf-8') . '"');
+                $this->lnk->exec('PRAGMA encoding = "'.$this->option('charset', 'utf-8').'"');
             } catch (\Exception $e) {
                 if ($this->lnk !== null) {
                     throw new DBException('Connect error: '.$this->lnk->lastErrorMsg());

src/schema/TableColumn.php

Spacing +4 added lines, -4 removed lines

@@ -42,7 +42,7 @@ 
             $instance->setNullable($data['nullable']);
         }
         if (isset($data['notnull'])) {
-            $instance->setNullable(!((int)$data['notnull']));
+            $instance->setNullable(!((int) $data['notnull']));
         }
         if (isset($data['Default'])) {
             $instance->setDefault($data['Default']);
@@ -57,7 +57,7 @@ 
             $instance->setLength($data['length']);
         }
         if ($instance->getBasicType() === 'enum' && strpos($instance->getType(), 'enum(') === 0) {
-            $temp = array_map(function ($v) {
+            $temp = array_map(function($v) {
                 return str_replace("''", "'", $v);
             }, explode("','", substr($instance->getType(), 6, -2)));
             $instance->setValues($temp);
@@ -86,7 +86,7 @@ 
                 $instance->setDefault(null);
             }
         }
-        if ($instance->getBasicType() === 'text' && isset($data['CHAR_LENGTH']) && (int)$data['CHAR_LENGTH']) {
+        if ($instance->getBasicType() === 'text' && isset($data['CHAR_LENGTH']) && (int) $data['CHAR_LENGTH']) {
             $instance->setLength($data['CHAR_LENGTH']);
         }
         return $instance;
@@ -183,7 +183,7 @@ 
     }
     public function getLength(): int
     {
-        return (int)$this->length;
+        return (int) $this->length;
     }
     public function setLength(int $length): static
     {

src/DBInterface.php

Spacing +2 added lines, -2 removed lines

@@ -104,8 +104,8 @@
     public function delete(Entity $entity): void;
     public function save(?Entity $entity = null): void;
 
-    public function getMapper(Table|string $table): MapperInterface;
-    public function setMapper(Table|string $table, MapperInterface $mapper, ?string $class = null): static;
+    public function getMapper(Table | string $table): MapperInterface;
+    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 T $entity
      * @return bool
      */
-    public function deleted(array|object $entity): bool;
+    public function deleted(array | object $entity): bool;
     /**
      * @param T $entity
      * @return bool
      */
-    public function exists(array|object $entity): bool;
+    public function exists(array | object $entity): bool;
     /**
      * @return array<int,T>
      */