vakata / database

src/DB.php

Spacing +24 added lines, -26 removed lines

@@ -69,18 +69,18 @@ 
                 ];
             }
         }
-        $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');
         }
@@ -118,7 +118,7 @@ 
         $new = '';
         $par = array_values($par);
         if (substr_count($sql, '?') === 2 && !is_array($par[0])) {
-            $par = [ $par ];
+            $par = [$par];
         }
         $parts = explode('??', $sql);
         $index = 0;
@@ -128,7 +128,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);
@@ -136,7 +136,7 @@ 
                 $new .= implode(',', array_fill(0, count($params), '?'));
             }
         }
-        return [ $new, $par ];
+        return [$new, $par];
     }
     /**
      * Run a query (prepare & execute).
@@ -185,7 +185,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;
@@ -194,18 +194,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;
             });
         }
@@ -300,8 +300,7 @@ 
     public function definition(string $table, bool $detectRelations = true) : Table
     {
         return isset($this->tables[$table]) ?
-            $this->tables[$table] :
-            $this->driver->table($table, $detectRelations);
+            $this->tables[$table] : $this->driver->table($table, $detectRelations);
     }
     /**
      * Parse all tables from the database.
@@ -318,13 +317,13 @@ 
      */
     public function getSchema(bool $asPlainArray = true): array
     {
-        return !$asPlainArray ? $this->tables : array_map(function ($table) {
+        return !$asPlainArray ? $this->tables : 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(),
@@ -335,9 +334,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();
@@ -394,8 +393,7 @@ 
     public function table(string $table, bool $mapped = false, bool $findRelations = false): TableQuery
     {
         return $mapped ?
-            new TableQueryMapped($this, $this->definition($table), $findRelations) :
-            new TableQuery($this, $this->definition($table), $findRelations);
+            new TableQueryMapped($this, $this->definition($table), $findRelations) : new TableQuery($this, $this->definition($table), $findRelations);
     }
     public function __call(string $method, array $args): TableQuery
     {
@@ -432,12 +430,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/Result.php

Spacing +2 added lines, -2 removed lines

@@ -57,8 +57,8 @@
     }
     public function next(): void
     {
-        $this->fetched ++;
-        $this->last = $this->statement->fetch(\PDO::FETCH_ASSOC)?:null;
+        $this->fetched++;
+        $this->last = $this->statement->fetch(\PDO::FETCH_ASSOC) ?: null;
     }
     public function valid(): bool
     {

src/driver/oracle/Result.php

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,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
     {
@@ -36,7 +36,7 @@ 
 
     public function count(): int
     {
-        return (int)\oci_num_rows($this->statement);
+        return (int) \oci_num_rows($this->statement);
     }
 
     public function key(): mixed
@@ -64,8 +64,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;
     }
     public function valid(): bool
     {

src/driver/oracle/Driver.php

Spacing +4 added lines, -4 removed lines

@@ -70,14 +70,14 @@
         if ($log) {
             $tm = microtime(true);
         }
-        $res = \oci_execute(\oci_parse($this->lnk, $sql)?:throw new \Exception());
+        $res = \oci_execute(\oci_parse($this->lnk, $sql) ?: throw new \Exception());
         if ($log) {
             $tm = microtime(true) - $tm;
-            if ($tm >= (float)$this->option('log_slow', 0)) {
+            if ($tm >= (float) $this->option('log_slow', 0)) {
                 @file_put_contents(
                     $log,
-                    '--' . date('Y-m-d H:i:s') . ' ' . sprintf('%01.6f', $tm) . "s\r\n" .
-                    $sql . "\r\n" .
+                    '--'.date('Y-m-d H:i:s').' '.sprintf('%01.6f', $tm)."s\r\n".
+                    $sql."\r\n".
                     "\r\n",
                     FILE_APPEND
                 );

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);
                     }
@@ -53,7 +53,7 @@ 
     }
     public function affected() : int
     {
-        return (int)$this->statement->affected_rows;
+        return (int) $this->statement->affected_rows;
     }
     public function insertID(string $sequence = null): mixed
     {
@@ -75,7 +75,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);
     }
@@ -94,8 +94,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/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')
@@ -59,7 +59,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) {
@@ -69,8 +69,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(
@@ -80,12 +80,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;
                 }
             }
         }
@@ -94,14 +94,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;
@@ -123,7 +123,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;
@@ -135,7 +135,7 @@ 
             ->setPrimaryKey(
                 $columns
                     ->clone()
-                    ->filter(function (array $v): bool {
+                    ->filter(function(array $v): bool {
                         return $v['Key'] === 'PRI';
                     })
                     ->pluck('Field')
@@ -149,8 +149,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'] . '.' . $relation['TABLE_NAME'];
+            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'];
             }
@@ -166,10 +166,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;
@@ -177,7 +177,7 @@ 
                             return $new;
                         }) as $relation
                     ) {
-                        $foreign[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'] . '.' . $relation['REFERENCED_TABLE_NAME'];
+                        $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'];
                         $usedcol[] = $relation['COLUMN_NAME'];
@@ -193,7 +193,7 @@ 
                     $orig = $relname;
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $orig . '_' . (++ $cntr);
+                        $relname = $orig.'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -214,7 +214,7 @@ 
                     $orig = $relname;
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $orig . '_' . (++ $cntr);
+                        $relname = $orig.'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -230,8 +230,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;
@@ -239,7 +239,7 @@ 
                     return $new;
                 }) as $relation
             ) {
-                $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'] . '.' . $relation['REFERENCED_TABLE_NAME'];
+                $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'];
             }
@@ -252,7 +252,7 @@ 
                 $orig = $relname;
                 $cntr = 1;
                 while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                    $relname = $orig . '_' . (++ $cntr);
+                    $relname = $orig.'_'.(++$cntr);
                 }
                 $definition->addRelation(
                     new TableRelation(
@@ -273,23 +273,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 $v['TABLE_NAME'];
             })
             ->pluck('TABLE_NAME')
-            ->map(function (string $v): Table {
+            ->map(function(string $v): Table {
                 return $this->table($v);
             })
             ->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/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);
@@ -92,24 +92,24 @@ 
             $tm = microtime(true);
         }
         if (!$this->statement->execute()) {
-            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/sphinx/Result.php

Spacing +2 added lines, -2 removed lines

@@ -57,8 +57,8 @@
     }
     public function next(): void
     {
-        $this->fetched ++;
-        $this->last = $this->result->fetch_assoc()?:null;
+        $this->fetched++;
+        $this->last = $this->result->fetch_assoc() ?: null;
     }
     public function valid(): bool
     {

src/driver/sphinx/Statement.php

Spacing +5 added lines, -5 removed lines

@@ -40,23 +40,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;