@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | $new = ''; |
| 13 | 13 | $par = array_values($par); |
| 14 | 14 | if (substr_count($sql, '?') === 2 && !is_array($par[0])) { |
| 15 | - $par = [ $par ]; |
|
| 15 | + $par = [$par]; |
|
| 16 | 16 | } |
| 17 | 17 | $parts = explode('??', $sql); |
| 18 | 18 | $index = 0; |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | $index += count($tmp) - 1; |
| 23 | 23 | if (isset($par[$index])) { |
| 24 | 24 | if (!is_array($par[$index])) { |
| 25 | - $par[$index] = [ $par[$index] ]; |
|
| 25 | + $par[$index] = [$par[$index]]; |
|
| 26 | 26 | } |
| 27 | 27 | $params = $par[$index]; |
| 28 | 28 | array_splice($par, $index, 1, $params); |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | $new .= implode(',', array_fill(0, count($params), '?')); |
| 31 | 31 | } |
| 32 | 32 | } |
| 33 | - return [ $new, $par ]; |
|
| 33 | + return [$new, $par]; |
|
| 34 | 34 | } |
| 35 | 35 | /** |
| 36 | 36 | * Run a query (prepare & execute). |
@@ -23,8 +23,7 @@ |
||
| 23 | 23 | $data = array(); |
| 24 | 24 | } |
| 25 | 25 | $temp = (is_array($data) && count($data)) ? |
| 26 | - \pg_query_params($this->driver, $this->statement, $data) : |
|
| 27 | - \pg_query_params($this->driver, $this->statement, array()); |
|
| 26 | + \pg_query_params($this->driver, $this->statement, $data) : \pg_query_params($this->driver, $this->statement, array()); |
|
| 28 | 27 | if (!$temp) { |
| 29 | 28 | throw new DBException('Could not execute query : '.\pg_last_error($this->driver).' <'.$this->statement.'>'); |
| 30 | 29 | } |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | } |
| 63 | 63 | public function next() |
| 64 | 64 | { |
| 65 | - $this->fetched ++; |
|
| 65 | + $this->fetched++; |
|
| 66 | 66 | $this->last = \pg_fetch_array($this->statement, null, \PGSQL_ASSOC); |
| 67 | 67 | } |
| 68 | 68 | public function valid() |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | } |
| 65 | 65 | public function next() |
| 66 | 66 | { |
| 67 | - $this->fetched ++; |
|
| 67 | + $this->fetched++; |
|
| 68 | 68 | $this->last = \oci_fetch_array($this->statement, \OCI_ASSOC + \OCI_RETURN_NULLS + \OCI_RETURN_LOBS); |
| 69 | 69 | } |
| 70 | 70 | public function valid() |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | } |
| 63 | 63 | public function next() |
| 64 | 64 | { |
| 65 | - $this->fetched ++; |
|
| 65 | + $this->fetched++; |
|
| 66 | 66 | $this->last = $this->statement->fetchArray(\SQLITE3_ASSOC); |
| 67 | 67 | } |
| 68 | 68 | public function valid() |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | if ($temp) { |
| 30 | 30 | $temp = $temp->fetch_fields(); |
| 31 | 31 | if ($temp) { |
| 32 | - $columns = array_map(function ($v) { return $v->name; }, $temp); |
|
| 32 | + $columns = array_map(function($v) { return $v->name; }, $temp); |
|
| 33 | 33 | } |
| 34 | 34 | } |
| 35 | 35 | if (count($columns)) { |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | } |
| 68 | 68 | public function current() |
| 69 | 69 | { |
| 70 | - return $this->nativeDriver ? $this->last : array_map(function ($v) { return $v; }, $this->row); |
|
| 70 | + return $this->nativeDriver ? $this->last : array_map(function($v) { return $v; }, $this->row); |
|
| 71 | 71 | } |
| 72 | 72 | public function rewind() |
| 73 | 73 | { |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | } |
| 85 | 85 | public function next() |
| 86 | 86 | { |
| 87 | - $this->fetched ++; |
|
| 87 | + $this->fetched++; |
|
| 88 | 88 | $this->last = $this->nativeDriver ? $this->result->fetch_assoc() : $this->statement->fetch(); |
| 89 | 89 | } |
| 90 | 90 | public function valid() |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | { |
| 37 | 37 | if ($this->lnk === null) { |
| 38 | 38 | $this->lnk = new \mysqli( |
| 39 | - (isset($this->connection['opts']['persist']) && $this->connection['opts']['persist'] ? 'p:' : '') . |
|
| 39 | + (isset($this->connection['opts']['persist']) && $this->connection['opts']['persist'] ? 'p:' : ''). |
|
| 40 | 40 | $this->connection['host'], |
| 41 | 41 | $this->connection['user'], |
| 42 | 42 | $this->connection['pass'], |
@@ -101,21 +101,21 @@ discard block |
||
| 101 | 101 | ->addColumns( |
| 102 | 102 | $columns |
| 103 | 103 | ->clone() |
| 104 | - ->mapKey(function ($v) { return $v['Field']; }) |
|
| 104 | + ->mapKey(function($v) { return $v['Field']; }) |
|
| 105 | 105 | ->toArray() |
| 106 | 106 | ) |
| 107 | 107 | ->setPrimaryKey( |
| 108 | 108 | $columns |
| 109 | 109 | ->clone() |
| 110 | - ->filter(function ($v) { return $v['Key'] === 'PRI'; }) |
|
| 110 | + ->filter(function($v) { return $v['Key'] === 'PRI'; }) |
|
| 111 | 111 | ->pluck('Field') |
| 112 | 112 | ->toArray() |
| 113 | 113 | ) |
| 114 | 114 | ->setComment( |
| 115 | - (string)Collection::from($this |
|
| 115 | + (string) Collection::from($this |
|
| 116 | 116 | ->query( |
| 117 | 117 | "SELECT table_comment FROM information_schema.tables WHERE table_schema = ? AND table_name = ?", |
| 118 | - [ $this->connection['name'], $table ] |
|
| 118 | + [$this->connection['name'], $table] |
|
| 119 | 119 | )) |
| 120 | 120 | ->pluck('table_comment') |
| 121 | 121 | ->value() |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | "SELECT TABLE_NAME, COLUMN_NAME, CONSTRAINT_NAME, REFERENCED_COLUMN_NAME |
| 133 | 133 | FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE |
| 134 | 134 | WHERE TABLE_SCHEMA = ? AND REFERENCED_TABLE_SCHEMA = ? AND REFERENCED_TABLE_NAME = ?", |
| 135 | - [ $this->connection['name'], $this->connection['name'], $table ] |
|
| 135 | + [$this->connection['name'], $this->connection['name'], $table] |
|
| 136 | 136 | ) as $relation |
| 137 | 137 | ) { |
| 138 | 138 | $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_NAME']; |
@@ -158,9 +158,9 @@ discard block |
||
| 158 | 158 | WHERE |
| 159 | 159 | TABLE_SCHEMA = ? AND TABLE_NAME = ? AND COLUMN_NAME IN (??) AND |
| 160 | 160 | REFERENCED_TABLE_NAME IS NOT NULL", |
| 161 | - [ $this->connection['name'], $data['table'], $columns ] |
|
| 161 | + [$this->connection['name'], $data['table'], $columns] |
|
| 162 | 162 | )) |
| 163 | - ->map(function ($v) { |
|
| 163 | + ->map(function($v) { |
|
| 164 | 164 | $new = []; |
| 165 | 165 | foreach ($v as $kk => $vv) { |
| 166 | 166 | $new[strtoupper($kk)] = $vv; |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | $relname = $foreign['table']; |
| 179 | 179 | $cntr = 1; |
| 180 | 180 | while ($definition->hasRelation($relname) || $definition->getName() == $relname) { |
| 181 | - $relname = $foreign['table'] . '_' . (++ $cntr); |
|
| 181 | + $relname = $foreign['table'].'_'.(++$cntr); |
|
| 182 | 182 | } |
| 183 | 183 | $definition->addRelation( |
| 184 | 184 | new TableRelation( |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | $relname = $data['table']; |
| 195 | 195 | $cntr = 1; |
| 196 | 196 | while ($definition->hasRelation($relname) || $definition->getName() == $relname) { |
| 197 | - $relname = $data['table'] . '_' . (++ $cntr); |
|
| 197 | + $relname = $data['table'].'_'.(++$cntr); |
|
| 198 | 198 | } |
| 199 | 199 | $definition->addRelation( |
| 200 | 200 | new TableRelation( |
@@ -215,9 +215,9 @@ discard block |
||
| 215 | 215 | "SELECT TABLE_NAME, COLUMN_NAME, CONSTRAINT_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME |
| 216 | 216 | FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE |
| 217 | 217 | WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ? AND REFERENCED_TABLE_NAME IS NOT NULL", |
| 218 | - [ $this->connection['name'], $table ] |
|
| 218 | + [$this->connection['name'], $table] |
|
| 219 | 219 | )) |
| 220 | - ->map(function ($v) { |
|
| 220 | + ->map(function($v) { |
|
| 221 | 221 | $new = []; |
| 222 | 222 | foreach ($v as $kk => $vv) { |
| 223 | 223 | $new[strtoupper($kk)] = $vv; |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | $relname = $data['table']; |
| 233 | 233 | $cntr = 1; |
| 234 | 234 | while ($definition->hasRelation($relname) || $definition->getName() == $relname) { |
| 235 | - $relname = $data['table'] . '_' . (++ $cntr); |
|
| 235 | + $relname = $data['table'].'_'.(++$cntr); |
|
| 236 | 236 | } |
| 237 | 237 | $definition->addRelation( |
| 238 | 238 | new TableRelation( |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | "SELECT table_name FROM information_schema.tables where table_schema = ?", |
| 254 | 254 | [$this->connection['name']] |
| 255 | 255 | )) |
| 256 | - ->map(function ($v) { |
|
| 256 | + ->map(function($v) { |
|
| 257 | 257 | $new = []; |
| 258 | 258 | foreach ($v as $kk => $vv) { |
| 259 | 259 | $new[strtoupper($kk)] = $vv; |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | return $new; |
| 262 | 262 | }) |
| 263 | 263 | ->pluck('TABLE_NAME') |
| 264 | - ->map(function ($v) { |
|
| 264 | + ->map(function($v) { |
|
| 265 | 265 | return $this->table($v); |
| 266 | 266 | }) |
| 267 | 267 | ->toArray(); |
@@ -67,7 +67,7 @@ |
||
| 67 | 67 | } |
| 68 | 68 | public function next() |
| 69 | 69 | { |
| 70 | - $this->fetched ++; |
|
| 70 | + $this->fetched++; |
|
| 71 | 71 | $this->last = \ibase_fetch_assoc($this->result, \IBASE_TEXT); |
| 72 | 72 | } |
| 73 | 73 | public function valid() |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | $this->connect(); |
| 53 | 53 | $statement = \ibase_prepare($this->transaction !== null ? $this->transaction : $this->lnk, $sql); |
| 54 | 54 | if ($statement === false) { |
| 55 | - throw new DBException('Prepare error: ' . \ibase_errmsg()); |
|
| 55 | + throw new DBException('Prepare error: '.\ibase_errmsg()); |
|
| 56 | 56 | } |
| 57 | 57 | return new Statement( |
| 58 | 58 | $statement, |