vakata / database

src/schema/Table.php

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
     public function setPrimaryKey($column) : Table
     {
         if (!is_array($column)) {
-            $column = [ $column ];
+            $column = [$column];
         }
         $this->data['primary'] = $column;
         return $this;
@@ -165,7 +165,7 @@ 
         }
 
         if (!isset($name)) {
-            $name = $toTable->getName() . '_' . implode('_', array_keys($keymap));
+            $name = $toTable->getName().'_'.implode('_', array_keys($keymap));
         }
         $this->addRelation(new TableRelation(
             $name,

src/driver/mysql/Statement.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
             }
         }
         if (!$this->statement->execute()) {
-            throw new DBException('Prepared execute error: ' . $this->statement->error);
+            throw new DBException('Prepared execute error: '.$this->statement->error);
         }
         return new Result($this->statement);
     }

src/driver/odbc/Result.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
     }
     public function next()
     {
-        $this->fetched ++;
+        $this->fetched++;
         $temp = \odbc_fetch_row($this->statement);
         if (!$temp) {
             $this->last = false;

src/schema/TableQueryIterator.php

Spacing +7 added lines, -7 removed lines

@@ -70,7 +70,7 @@ 
                 $fields = [];
                 $exists = false;
                 foreach ($relation->table->getColumns() as $column) {
-                    $nm = $name . static::SEP . $column;
+                    $nm = $name.static::SEP.$column;
                     if (isset($this->aliases[$nm])) {
                         $nm = $this->aliases[$nm];
                     }
@@ -84,16 +84,16 @@ 
                 $parts = explode(static::SEP, $name);
                 $name  = array_pop($parts);
                 if (!$exists && !count($parts) && !isset($temp[$name])) {
-                    $temp[$name] = $relation->many ? [ '___clean' => true ] : null;
+                    $temp[$name] = $relation->many ? ['___clean' => true] : null;
                 }
                 if ($exists) {
-                    $full  = '';
+                    $full = '';
                     foreach ($parts as $item) {
-                        $full = $full ? $full . static::SEP . $item : $item;
+                        $full = $full ? $full.static::SEP.$item : $item;
                         $temp = &$temp[$item];
                         $rpk = [];
                         foreach ($this->relations[$full][0]->table->getPrimaryKey() as $pkey) {
-                            $nm = $full . static::SEP . $pkey;
+                            $nm = $full.static::SEP.$pkey;
                             if (isset($this->aliases[$nm])) {
                                 $nm = $this->aliases[$nm];
                             }
@@ -102,7 +102,7 @@ 
                         $temp = &$temp[json_encode($rpk)];
                     }
                     if (!isset($temp[$name])) {
-                        $temp[$name] = $relation->many ? [ '___clean' => true ] : null;
+                        $temp[$name] = $relation->many ? ['___clean' => true] : null;
                     }
                     $temp = &$temp[$name];
                     if ($relation->many) {
@@ -160,7 +160,7 @@ 
                 return;
             }
         }
-        $this->fetched ++;
+        $this->fetched++;
         while ($this->result->valid()) {
             $row = $this->result->current();
             $pk = [];

src/schema/TableColumn.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,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);

src/driver/pdo/Statement.php

Spacing +6 added lines, -6 removed lines

@@ -24,28 +24,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/DB.php

Spacing +14 added lines, -17 removed lines

@@ -75,8 +75,7 @@ 
         }
         $connection['name'] = $connectionString;
         $connection['type'] = isset($aliases[$connection['type']]) ?
-            $aliases[$connection['type']] :
-            $connection['type'];
+            $aliases[$connection['type']] : $connection['type'];
         $tmp = '\\vakata\\database\\driver\\'.strtolower($connection['type']).'\\Driver';
         return new $tmp($connection);
     }
@@ -105,7 +104,7 @@ 
         $new = '';
         $par = array_values($par);
         if (substr_count($sql, '?') === 2 && !is_array($par[0])) {
-            $par = [ $par ];
+            $par = [$par];
         }
         $parts = explode('??', $sql);
         $index = 0;
@@ -115,7 +114,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);
@@ -123,7 +122,7 @@ 
                 $new .= implode(',', array_fill(0, count($params), '?'));
             }
         }
-        return [ $new, $par ];
+        return [$new, $par];
     }
     /**
      * Run a query (prepare & execute).
@@ -155,7 +154,7 @@ 
     {
         $coll = Collection::from($this->query($sql, $par));
         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;
@@ -164,13 +163,13 @@ 
             });
         }
         if ($key !== null) {
-            $coll->mapKey(function ($v) use ($key) { return $v[$key]; });
+            $coll->mapKey(function($v) use ($key) { return $v[$key]; });
         }
         if ($skip) {
-            $coll->map(function ($v) use ($key) { unset($v[$key]); return $v; });
+            $coll->map(function($v) use ($key) { unset($v[$key]); return $v; });
         }
         if ($opti) {
-            $coll->map(function ($v) { return count($v) === 1 ? current($v) : $v; });
+            $coll->map(function($v) { return count($v) === 1 ? current($v) : $v; });
         }
         return $coll;
     }
@@ -254,8 +253,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.
@@ -272,12 +270,12 @@ 
      */
     public function getSchema($asPlainArray = true)
     {
-        return !$asPlainArray ? $this->tables : array_map(function ($table) {
+        return !$asPlainArray ? $this->tables : array_map(function($table) {
             return [
                 'name' => $table->getName(),
                 'pkey' => $table->getPrimaryKey(),
                 'comment' => $table->getComment(),
-                'columns' => array_map(function ($column) {
+                'columns' => array_map(function($column) {
                     return [
                         'name' => $column->getName(),
                         'type' => $column->getType(),
@@ -288,13 +286,13 @@ 
                         'nullable' => $column->isNullable()
                     ];
                 }, $table->getFullColumns()),
-                'relations' => array_map(function ($rel) {
+                'relations' => array_map(function($rel) {
                     $relation = clone $rel;
                     $relation->table = $relation->table->getName();
                     if ($relation->pivot) {
                         $relation->pivot = $relation->pivot->getName();
                     }
-                    return (array)$relation;
+                    return (array) $relation;
                 }, $table->getRelations())
             ];
         }, $this->tables);
@@ -342,8 +340,7 @@ 
     public function table($table, bool $mapped = false)
     {
         return $mapped ?
-            new TableQueryMapped($this, $this->definition($table)) :
-            new TableQuery($this, $this->definition($table));
+            new TableQueryMapped($this, $this->definition($table)) : new TableQuery($this, $this->definition($table));
     }
     public function __call($method, $args)
     {

src/driver/oracle/Schema.php

Spacing +25 added lines, -25 removed lines

@@ -138,17 +138,17 @@ 
         $columns = Collection::from($this
             ->query(
                 "SELECT * FROM all_tab_cols WHERE table_name = ? AND owner = ?",
-                [ strtoupper($table), $this->name() ]
+                [strtoupper($table), $this->name()]
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
                 }
                 return $new;
             })
-            ->mapKey(function ($v) { return $v['COLUMN_NAME']; })
-            ->map(function ($v) {
+            ->mapKey(function($v) { return $v['COLUMN_NAME']; })
+            ->map(function($v) {
                 $v['length'] = null;
                 if (!isset($v['DATA_TYPE'])) {
                     return $v;
@@ -160,7 +160,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;
@@ -176,9 +176,9 @@ 
             ->query(
                 "SELECT constraint_name FROM all_constraints
                 WHERE table_name = ? AND constraint_type = ? AND owner = ?",
-                [ strtoupper($table), 'P', $owner ]
+                [strtoupper($table), 'P', $owner]
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
@@ -193,9 +193,9 @@ 
                 ->query(
                     "SELECT column_name FROM all_cons_columns
                     WHERE table_name = ? AND constraint_name = ? AND owner = ?",
-                    [ strtoupper($table), $pkname, $owner ]
+                    [strtoupper($table), $pkname, $owner]
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -222,9 +222,9 @@ 
                     LEFT JOIN all_cons_columns cc ON cc.OWNER = ac.OWNER AND cc.CONSTRAINT_NAME = ac.CONSTRAINT_NAME
                     WHERE ac.OWNER = ? AND ac.R_OWNER = ? AND ac.R_CONSTRAINT_NAME = ? AND ac.CONSTRAINT_TYPE = ?
                     ORDER BY cc.POSITION",
-                    [ $owner, $owner, $pkname, 'R' ]
+                    [$owner, $owner, $pkname, 'R']
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -234,7 +234,7 @@ 
                  as $relation
             ) {
                 $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_NAME'];
-                $relations[$relation['CONSTRAINT_NAME']]['keymap'][$primary[(int)$relation['POSITION']-1]] = $relation['COLUMN_NAME'];
+                $relations[$relation['CONSTRAINT_NAME']]['keymap'][$primary[(int) $relation['POSITION'] - 1]] = $relation['COLUMN_NAME'];
             }
             foreach ($relations as $data) {
                 $rtable = $this->table($data['table'], true);
@@ -258,9 +258,9 @@ 
                                 ac.OWNER = ? AND ac.R_OWNER = ? AND ac.TABLE_NAME = ? AND ac.CONSTRAINT_TYPE = ? AND
                                 cc.COLUMN_NAME IN (??)
                             ORDER BY POSITION",
-                            [ $owner, $owner, $data['table'], 'R', $columns ]
+                            [$owner, $owner, $data['table'], 'R', $columns]
                         ))
-                        ->map(function ($v) {
+                        ->map(function($v) {
                             $new = [];
                             foreach ($v as $kk => $vv) {
                                 $new[strtoupper($kk)] = $vv;
@@ -278,9 +278,9 @@ 
                     $rcolumns = Collection::from($this
                         ->query(
                             "SELECT COLUMN_NAME FROM all_cons_columns WHERE OWNER = ? AND CONSTRAINT_NAME = ? ORDER BY POSITION",
-                            [ $owner, current($foreign['keymap']) ]
+                            [$owner, current($foreign['keymap'])]
                         ))
-                        ->map(function ($v) {
+                        ->map(function($v) {
                             $new = [];
                             foreach ($v as $kk => $vv) {
                                 $new[strtoupper($kk)] = $vv;
@@ -295,7 +295,7 @@ 
                     $relname = $foreign['table'];
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $foreign['table'] . '_' . (++ $cntr);
+                        $relname = $foreign['table'].'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -311,7 +311,7 @@ 
                     $relname = $data['table'];
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $data['table'] . '_' . (++ $cntr);
+                        $relname = $data['table'].'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -335,9 +335,9 @@ 
                     LEFT JOIN all_cons_columns cc ON cc.OWNER = ac.OWNER AND cc.CONSTRAINT_NAME = ac.CONSTRAINT_NAME
                     WHERE ac.OWNER = ? AND ac.R_OWNER = ? AND ac.TABLE_NAME = ? AND ac.CONSTRAINT_TYPE = ?
                     ORDER BY cc.POSITION",
-                    [ $owner, $owner, strtoupper($table), 'R' ]
+                    [$owner, $owner, strtoupper($table), 'R']
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -353,9 +353,9 @@ 
                 $rcolumns = Collection::from($this
                     ->query(
                         "SELECT COLUMN_NAME FROM all_cons_columns WHERE OWNER = ? AND CONSTRAINT_NAME = ? ORDER BY POSITION",
-                        [ $owner, current($data['keymap']) ]
+                        [$owner, current($data['keymap'])]
                     ))
-                    ->map(function ($v) {
+                    ->map(function($v) {
                         $new = [];
                         foreach ($v as $kk => $vv) {
                             $new[strtoupper($kk)] = $vv;
@@ -370,7 +370,7 @@ 
                 $relname = $data['table'];
                 $cntr = 1;
                 while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                    $relname = $data['table'] . '_' . (++ $cntr);
+                    $relname = $data['table'].'_'.(++$cntr);
                 }
                 $definition->addRelation(
                     new TableRelation(
@@ -391,7 +391,7 @@ 
                 "SELECT TABLE_NAME FROM ALL_TABLES where OWNER = ?",
                 [$this->connection['name']]
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
@@ -399,7 +399,7 @@ 
                 return $new;
             })
             ->pluck('TABLE_NAME')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->table($v);
             })
             ->toArray();

src/driver/postgre/Schema.php

Spacing +13 added lines, -13 removed lines

@@ -147,7 +147,7 @@ 
                      JOIN information_schema.constraint_table_usage ct ON kc.constraint_name = ct.constraint_name AND ct.table_schema = kc.table_schema
                      WHERE
                         kc.table_schema = ? AND kc.table_name IS NOT NULL AND kc.position_in_unique_constraint IS NOT NULL",
-                    [ $this->connection['opts']['schema'] ?? $this->connection['name'] ]
+                    [$this->connection['opts']['schema'] ?? $this->connection['name']]
                 )
             )->toArray();
             foreach ($col as $row) {
@@ -159,10 +159,10 @@ 
         $columns = Collection::from($this
             ->query(
                 "SELECT * FROM information_schema.columns WHERE table_name = ? AND table_schema = ?",
-                [ $table, $this->connection['opts']['schema'] ?? $this->connection['name'] ]
+                [$table, $this->connection['opts']['schema'] ?? $this->connection['name']]
             ))
-            ->mapKey(function ($v) { return $v['column_name']; })
-            ->map(function ($v) {
+            ->mapKey(function($v) { return $v['column_name']; })
+            ->map(function($v) {
                 $v['length'] = null;
                 if (!isset($v['data_type'])) {
                     return $v;
@@ -170,7 +170,7 @@ 
                 switch ($v['data_type']) {
                     case 'character':
                     case 'character varying':
-                        $v['length'] = (int)$v['character_maximum_length'];
+                        $v['length'] = (int) $v['character_maximum_length'];
                         break;
                 }
                 return $v;
@@ -183,7 +183,7 @@ 
             ->query(
                 "SELECT constraint_name FROM information_schema.table_constraints
                 WHERE table_name = ? AND constraint_type = ? AND table_schema = ?",
-                [ $table, 'PRIMARY KEY', $this->connection['opts']['schema'] ?? $this->connection['name'] ]
+                [$table, 'PRIMARY KEY', $this->connection['opts']['schema'] ?? $this->connection['name']]
             ))
             ->pluck('constraint_name')
             ->value();
@@ -193,7 +193,7 @@ 
                 ->query(
                     "SELECT column_name FROM information_schema.constraint_column_usage
                      WHERE table_name = ? AND constraint_name = ? AND table_schema = ?",
-                    [ $table, $pkname, $this->connection['opts']['schema'] ?? $this->connection['name'] ]
+                    [$table, $pkname, $this->connection['opts']['schema'] ?? $this->connection['name']]
                 ))
                 ->pluck('column_name')
                 ->toArray();
@@ -224,7 +224,7 @@ 
                 $usedcol = [];
                 if (count($columns)) {
                     foreach (Collection::from($relationsT[$data['table']] ?? [])
-                        ->filter(function ($v) use ($columns) {
+                        ->filter(function($v) use ($columns) {
                             return in_array($v['column_name'], $columns);
                         }) as $relation
                     ) {
@@ -238,7 +238,7 @@ 
                     $relname = $foreign['table'];
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $foreign['table'] . '_' . (++ $cntr);
+                        $relname = $foreign['table'].'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -254,7 +254,7 @@ 
                     $relname = $data['table'];
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $data['table'] . '_' . (++ $cntr);
+                        $relname = $data['table'].'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -278,7 +278,7 @@ 
                 $relname = $data['table'];
                 $cntr = 1;
                 while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                    $relname = $data['table'] . '_' . (++ $cntr);
+                    $relname = $data['table'].'_'.(++$cntr);
                 }
                 $definition->addRelation(
                     new TableRelation(
@@ -297,10 +297,10 @@ 
         return Collection::from($this
             ->query(
                 "SELECT table_name FROM information_schema.tables where table_schema = ?",
-                [ $this->connection['opts']['schema'] ?? $this->connection['name'] ]
+                [$this->connection['opts']['schema'] ?? $this->connection['name']]
             ))
             ->pluck('table_name')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->table($v);
             })
             ->toArray();