vakata / database

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/driver/oracle/Driver.php

Indentation +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 
     public function begin() : bool
     {
-         return $this->transaction = true;
+            return $this->transaction = true;
     }
     public function commit() : bool
     {

src/driver/mysql/Driver.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
     {
         if ($this->lnk === null) {
             $this->lnk = new \mysqli(
-                (isset($this->connection['opts']['persist']) && $this->connection['opts']['persist'] ? 'p:' : '') .
+                (isset($this->connection['opts']['persist']) && $this->connection['opts']['persist'] ? 'p:' : '').
                     $this->connection['host'],
                 $this->connection['user'],
                 $this->connection['pass'],

src/driver/oracle/Schema.php

Indentation +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
                     }
                     return $new;
                 })
-                 as $relation
+                    as $relation
             ) {
                 $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_NAME'];
                 $relations[$relation['CONSTRAINT_NAME']]['keymap'][$primary[(int)$relation['POSITION']-1]] =

Spacing +25 added lines, -25 removed lines

@@ -29,19 +29,19 @@ 
         $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) {
+            ->mapKey(function($v) {
                 return $v['COLUMN_NAME'];
             })
-            ->map(function ($v) {
+            ->map(function($v) {
                 $v['length'] = null;
                 if (!isset($v['DATA_TYPE'])) {
                     return $v;
@@ -53,7 +53,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;
@@ -69,9 +69,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;
@@ -86,9 +86,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;
@@ -115,9 +115,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;
@@ -127,7 +127,7 @@ 
                  as $relation
             ) {
                 $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_NAME'];
-                $relations[$relation['CONSTRAINT_NAME']]['keymap'][$primary[(int)$relation['POSITION']-1]] =
+                $relations[$relation['CONSTRAINT_NAME']]['keymap'][$primary[(int) $relation['POSITION'] - 1]] =
                     $relation['COLUMN_NAME'];
             }
             foreach ($relations as $data) {
@@ -157,9 +157,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;
@@ -179,9 +179,9 @@ 
                         ->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;
@@ -196,7 +196,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(
@@ -212,7 +212,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(
@@ -240,9 +240,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;
@@ -260,9 +260,9 @@ 
                     ->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;
@@ -277,7 +277,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(
@@ -298,7 +298,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;
@@ -306,7 +306,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

@@ -47,7 +47,7 @@ 
                         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) {
@@ -59,12 +59,12 @@ 
         $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) {
+            ->mapKey(function($v) {
                 return $v['column_name'];
             })
-            ->map(function ($v) {
+            ->map(function($v) {
                 $v['length'] = null;
                 if (!isset($v['data_type'])) {
                     return $v;
@@ -72,7 +72,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;
@@ -85,7 +85,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();
@@ -95,7 +95,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();
@@ -127,7 +127,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
                     ) {
@@ -142,7 +142,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(
@@ -158,7 +158,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(
@@ -183,7 +183,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(
@@ -202,10 +202,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();

src/driver/mysql/Schema.php

Spacing +14 added lines, -14 removed lines

@@ -28,10 +28,10 @@ 
             $comments = Collection::from(
                 $this->query(
                     "SELECT TABLE_NAME, TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = ?",
-                    [ $this->connection['opts']['schema'] ?? $this->connection['name'] ]
+                    [$this->connection['opts']['schema'] ?? $this->connection['name']]
                 )
             )
-            ->mapKey(function ($v) {
+            ->mapKey(function($v) {
                 return $v['TABLE_NAME'];
             })
             ->pluck('TABLE_COMMENT')
@@ -71,10 +71,10 @@ 
             ->addColumns(
                 $columns
                     ->clone()
-                    ->mapKey(function ($v) {
+                    ->mapKey(function($v) {
                         return $v['Field'];
                     })
-                    ->map(function ($v) {
+                    ->map(function($v) {
                         $v['length'] = null;
                         if (!isset($v['Type'])) {
                             return $v;
@@ -96,7 +96,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;
@@ -108,7 +108,7 @@ 
             ->setPrimaryKey(
                 $columns
                     ->clone()
-                    ->filter(function ($v) {
+                    ->filter(function($v) {
                         return $v['Key'] === 'PRI';
                     })
                     ->pluck('Field')
@@ -138,10 +138,10 @@ 
                 $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);
                         })
-                        ->map(function ($v) {
+                        ->map(function($v) {
                             $new = [];
                             foreach ($v as $kk => $vv) {
                                 $new[strtoupper($kk)] = $vv;
@@ -160,7 +160,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(
@@ -176,7 +176,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(
@@ -193,7 +193,7 @@ 
             // resulting in a "belongsTo" relationship
             $relations = [];
             foreach (Collection::from($relationsT[$table] ?? [])
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -209,7 +209,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(
@@ -230,7 +230,7 @@ 
                 "SELECT table_name FROM information_schema.tables where table_schema = ?",
                 [$this->connection['opts']['schema'] ?? $this->connection['name']]
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
@@ -238,7 +238,7 @@ 
                 return $new;
             })
             ->pluck('TABLE_NAME')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->table($v);
             })
             ->toArray();

src/driver/mysql/Result.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
                 if ($temp) {
                     $temp = $temp->fetch_fields();
                     if ($temp) {
-                        $columns = array_map(function ($v) {
+                        $columns = array_map(function($v) {
                             return $v->name;
                         }, $temp);
                     }
@@ -70,7 +70,7 @@ 
     }
     public function current()
     {
-        return $this->nativeDriver ? $this->last : array_map(function ($v) {
+        return $this->nativeDriver ? $this->last : array_map(function($v) {
             return $v;
         }, $this->row);
     }
@@ -89,7 +89,7 @@ 
     }
     public function next()
     {
-        $this->fetched ++;
+        $this->fetched++;
         $this->last = $this->nativeDriver ? $this->result->fetch_assoc() : $this->statement->fetch();
     }
     public function valid()