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/postgre/Statement.php

Spacing +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
             $data = array();
         }
         $temp = (is_array($data) && count($data)) ?
-            \pg_query_params($this->driver, $this->statement, $data) :
-            \pg_query_params($this->driver, $this->statement, array());
+            \pg_query_params($this->driver, $this->statement, $data) : \pg_query_params($this->driver, $this->statement, array());
         if (!$temp) {
             throw new DBException('Could not execute query : '.\pg_last_error($this->driver).' <'.$this->statement.'>');
         }

src/driver/postgre/Result.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
     }
     public function next()
     {
-        $this->fetched ++;
+        $this->fetched++;
         $this->last = \pg_fetch_array($this->statement, null, \PGSQL_ASSOC);
     }
     public function valid()

src/driver/oracle/Result.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
     }
     public function next()
     {
-        $this->fetched ++;
+        $this->fetched++;
         $this->last = \oci_fetch_array($this->statement, \OCI_ASSOC + \OCI_RETURN_NULLS + \OCI_RETURN_LOBS);
     }
     public function valid()

src/driver/oracle/Driver.php

Indentation +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
 
     public function begin() : bool
     {
-         return $this->transaction = true;
+            return $this->transaction = true;
     }
     public function commit() : bool
     {
@@ -199,7 +199,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]] = $relation['COLUMN_NAME'];

Spacing +23 added lines, -23 removed lines

@@ -124,16 +124,16 @@ 
         $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']; })
+            ->mapKey(function($v) { return $v['COLUMN_NAME']; })
             ->toArray();
         if (!count($columns)) {
             throw new DBException('Table not found by name');
@@ -143,9 +143,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;
@@ -160,9 +160,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;
@@ -189,9 +189,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;
@@ -201,7 +201,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);
@@ -225,9 +225,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;
@@ -245,9 +245,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;
@@ -262,7 +262,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(
@@ -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(
@@ -302,9 +302,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;
@@ -320,9 +320,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;
@@ -337,7 +337,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(
@@ -358,7 +358,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;
@@ -366,7 +366,7 @@ 
                 return $new;
             })
             ->pluck('TABLE_NAME')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->table($v);
             })
             ->toArray();

src/driver/sqlite/Result.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
     }
     public function next()
     {
-        $this->fetched ++;
+        $this->fetched++;
         $this->last = $this->statement->fetchArray(\SQLITE3_ASSOC);
     }
     public function valid()

src/driver/sqlite/Driver.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
         parse_str($temp[1], $connection['opts']);
         $connection['name'] = $temp[0];
         if (!is_file($connection['name']) && is_file('/'.$connection['name'])) {
-           $connection['name'] = '/'.$connection['name'];
+            $connection['name'] = '/'.$connection['name'];
         }
         $this->connection = $connection;
     }

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) { return $v->name; }, $temp);
+                        $columns = array_map(function($v) { return $v->name; }, $temp);
                     }
                 }
                 if (count($columns)) {
@@ -67,7 +67,7 @@ 
     }
     public function current()
     {
-        return $this->nativeDriver ? $this->last : array_map(function ($v) { return $v; }, $this->row);
+        return $this->nativeDriver ? $this->last : array_map(function($v) { return $v; }, $this->row);
     }
     public function rewind()
     {
@@ -84,7 +84,7 @@ 
     }
     public function next()
     {
-        $this->fetched ++;
+        $this->fetched++;
         $this->last = $this->nativeDriver ? $this->result->fetch_assoc() : $this->statement->fetch();
     }
     public function valid()

src/driver/mysql/Driver.php

Spacing +15 added lines, -15 removed lines

@@ -36,7 +36,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'],
@@ -101,21 +101,21 @@ 
             ->addColumns(
                 $columns
                     ->clone()
-                    ->mapKey(function ($v) { return $v['Field']; })
+                    ->mapKey(function($v) { return $v['Field']; })
                     ->toArray()
             )
             ->setPrimaryKey(
                 $columns
                     ->clone()
-                    ->filter(function ($v) { return $v['Key'] === 'PRI'; })
+                    ->filter(function($v) { return $v['Key'] === 'PRI'; })
                     ->pluck('Field')
                     ->toArray()
             )
             ->setComment(
-                (string)Collection::from($this
+                (string) Collection::from($this
                     ->query(
                         "SELECT table_comment FROM information_schema.tables WHERE table_schema = ? AND table_name = ?",
-                        [ $this->connection['name'], $table ]
+                        [$this->connection['name'], $table]
                     ))
                     ->pluck('table_comment')
                     ->value()
@@ -132,7 +132,7 @@ 
                         "SELECT TABLE_NAME, COLUMN_NAME, CONSTRAINT_NAME, REFERENCED_COLUMN_NAME
                          FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE
                          WHERE TABLE_SCHEMA = ? AND REFERENCED_TABLE_SCHEMA = ? AND REFERENCED_TABLE_NAME = ?",
-                        [ $this->connection['name'], $this->connection['name'], $table ]
+                        [$this->connection['name'], $this->connection['name'], $table]
                     ) as $relation
             ) {
                 $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_NAME'];
@@ -158,9 +158,9 @@ 
                              WHERE
                                  TABLE_SCHEMA = ? AND TABLE_NAME = ? AND COLUMN_NAME IN (??) AND
                                  REFERENCED_TABLE_NAME IS NOT NULL",
-                            [ $this->connection['name'], $data['table'], $columns ]
+                            [$this->connection['name'], $data['table'], $columns]
                         ))
-                        ->map(function ($v) {
+                        ->map(function($v) {
                             $new = [];
                             foreach ($v as $kk => $vv) {
                                 $new[strtoupper($kk)] = $vv;
@@ -178,7 +178,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(
@@ -194,7 +194,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(
@@ -215,9 +215,9 @@ 
                     "SELECT TABLE_NAME, COLUMN_NAME, CONSTRAINT_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME
                      FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE
                      WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ? AND REFERENCED_TABLE_NAME IS NOT NULL",
-                    [ $this->connection['name'], $table ]
+                    [$this->connection['name'], $table]
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -232,7 +232,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(
@@ -253,7 +253,7 @@ 
                 "SELECT table_name FROM information_schema.tables where table_schema = ?",
                 [$this->connection['name']]
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
@@ -261,7 +261,7 @@ 
                 return $new;
             })
             ->pluck('TABLE_NAME')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->table($v);
             })
             ->toArray();