vakata / database

src/DriverAbstract.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
         $new = '';
         $par = array_values($par);
         if (substr_count($sql, '?') === 2 && !is_array($par[0])) {
-            $par = [ $par ];
+            $par = [$par];
         }
         $parts = explode('??', $sql);
         $index = 0;
@@ -22,7 +22,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);
@@ -30,7 +30,7 @@ 
                 $new .= implode(',', array_fill(0, count($params), '?'));
             }
         }
-        return [ $new, $par ];
+        return [$new, $par];
     }
     /**
      * Run a query (prepare & execute).

src/driver/pdo/Driver.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
                     isset($this->connection['opts']) ? $this->connection['opts'] : []
                 );
             } catch (\PDOException $e) {
-                throw new DBException('Connect error: ' . $e->getMessage());
+                throw new DBException('Connect error: '.$e->getMessage());
             }
         }
     }

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/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 +27 added lines, -27 removed lines

@@ -32,19 +32,19 @@ 
         $columns = Collection::from($this
             ->query(
                 "SELECT * FROM user_tab_cols WHERE UPPER(table_name) = ?",
-                [ strtoupper($table) ]
+                [strtoupper($table)]
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
                 }
                 return $new;
             })
-            ->mapKey(function ($v): string {
+            ->mapKey(function($v): string {
                 return $v['COLUMN_NAME'];
             })
-            ->map(function ($v) {
+            ->map(function($v) {
                 $v['length'] = null;
                 if (!isset($v['DATA_TYPE'])) {
                     return $v;
@@ -56,7 +56,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;
@@ -73,9 +73,9 @@ 
             ->query(
                 "SELECT constraint_name FROM user_constraints
                 WHERE table_name = ? AND constraint_type = ?",
-                [ strtoupper($table), 'P' ]
+                [strtoupper($table), 'P']
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
@@ -90,9 +90,9 @@ 
                 ->query(
                     "SELECT column_name FROM user_cons_columns
                     WHERE table_name = ? AND constraint_name = ?",
-                    [ strtoupper($table), $pkname ]
+                    [strtoupper($table), $pkname]
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -124,9 +124,9 @@ 
                     LEFT JOIN user_cons_columns cc ON cc.CONSTRAINT_NAME = ac.CONSTRAINT_NAME
                     WHERE ac.TABLE_NAME = ? AND ac.CONSTRAINT_TYPE = ?
                     ORDER BY cc.POSITION",
-                    [ strtoupper($table), 'R' ]
+                    [strtoupper($table), 'R']
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -144,9 +144,9 @@ 
                     ->query(
                         "SELECT COLUMN_NAME FROM user_cons_columns
                          WHERE CONSTRAINT_NAME = ? ORDER BY POSITION",
-                        [ current($data['keymap']) ]
+                        [current($data['keymap'])]
                     ))
-                    ->map(function ($v) {
+                    ->map(function($v) {
                         $new = [];
                         foreach ($v as $kk => $vv) {
                             $new[strtoupper($kk)] = $vv;
@@ -161,7 +161,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(
@@ -185,9 +185,9 @@ 
                     WHERE
                         ac.R_CONSTRAINT_NAME = ? AND ac.CONSTRAINT_TYPE = ?
                     ORDER BY cc.POSITION",
-                    [ $pkname, 'R' ]
+                    [$pkname, 'R']
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -197,10 +197,10 @@ 
                  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 ([ true, false ] as $pivot) {
+            foreach ([true, false] as $pivot) {
                 foreach ($relations as $data) {
                     $rtable = $this->table($data['table'], true);
                     $columns = [];
@@ -228,9 +228,9 @@ 
                                     ac.TABLE_NAME = ? AND ac.CONSTRAINT_TYPE = ? AND
                                     cc.COLUMN_NAME IN (??)
                                 ORDER BY POSITION",
-                                [ $data['table'], 'R', $columns ]
+                                [$data['table'], 'R', $columns]
                             ))
-                            ->map(function ($v) {
+                            ->map(function($v) {
                                 $new = [];
                                 foreach ($v as $kk => $vv) {
                                     $new[strtoupper($kk)] = $vv;
@@ -250,9 +250,9 @@ 
                             ->query(
                                 "SELECT COLUMN_NAME FROM user_cons_columns
                                 WHERE CONSTRAINT_NAME = ? ORDER BY POSITION",
-                                [ current($foreign['keymap']) ]
+                                [current($foreign['keymap'])]
                             ))
-                            ->map(function ($v) {
+                            ->map(function($v) {
                                 $new = [];
                                 foreach ($v as $kk => $vv) {
                                     $new[strtoupper($kk)] = $vv;
@@ -267,7 +267,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(
@@ -288,7 +288,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(
@@ -319,18 +319,18 @@ 
                  SELECT VIEW_NAME AS TABLE_NAME FROM USER_VIEWS",
                 []
             ))
-            ->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 strtolower($v['TABLE_NAME']);
             })
             ->pluck('TABLE_NAME')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->table($v)->toLowerCase();
             })
             ->toArray();

src/schema/TableQueryIterator.php

Spacing +7 added lines, -7 removed lines

@@ -76,7 +76,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];
                     }
@@ -90,17 +90,17 @@ 
                 $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];
                         if ($this->relations[$full][0]->many) {
                             $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];
                                 }
@@ -110,7 +110,7 @@ 
                         }
                     }
                     if (!isset($temp[$name])) {
-                        $temp[$name] = $relation->many ? [ '___clean' => true ] : null;
+                        $temp[$name] = $relation->many ? ['___clean' => true] : null;
                     }
                     $temp = &$temp[$name];
                     if ($relation->many) {
@@ -176,7 +176,7 @@ 
                 return;
             }
         }
-        $this->fetched ++;
+        $this->fetched++;
         while ($this->result->valid()) {
             $row = $this->result->current();
             $pk = [];

src/driver/oracle/Statement.php

Spacing +6 added lines, -6 removed lines

@@ -60,11 +60,11 @@ 
             if (!is_array($err)) {
                 $err = [];
             }
-            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: ' . implode(',', $err) . "\r\n" .
-                    $this->sql . "\r\n" .
+                    '--'.date('Y-m-d H:i:s').' ERROR: '.implode(',', $err)."\r\n".
+                    $this->sql."\r\n".
                     "\r\n",
                     FILE_APPEND
                 );
@@ -73,11 +73,11 @@ 
         }
         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/mysql/Driver.php

Spacing +4 added lines, -4 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'],
@@ -97,11 +97,11 @@ 
         $res = $this->lnk->query($sql);
         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/sphinx/Driver.php

Spacing +4 added lines, -4 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'],
@@ -97,11 +97,11 @@ 
         $res = $this->lnk->query($sql);
         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/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
     {