@@ -28,10 +28,10 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | protected function buildLimit($query, $offset = null) { |
| 30 | 30 | $limit = $this->limit; |
| 31 | - if($limit === null && $offset !== null) { |
|
| 31 | + if ($limit === null && $offset !== null) { |
|
| 32 | 32 | $limit = '18446744073709551615'; |
| 33 | 33 | } |
| 34 | - if($limit !== null) { |
|
| 34 | + if ($limit !== null) { |
|
| 35 | 35 | $query .= "LIMIT\n\t{$limit}\n"; |
| 36 | 36 | } |
| 37 | 37 | return $query; |
@@ -21,16 +21,16 @@ |
||
| 21 | 21 | * @return array[]|\Generator |
| 22 | 22 | */ |
| 23 | 23 | public function generate(QueryStatement $statement, Closure $callback = null) { |
| 24 | - while($row = $statement->fetch()) { |
|
| 25 | - if($this->preserveTypes) { |
|
| 24 | + while ($row = $statement->fetch()) { |
|
| 25 | + if ($this->preserveTypes) { |
|
| 26 | 26 | $columnDefinitions = FieldTypeProvider::getFieldTypes($statement); |
| 27 | 27 | $row = FieldValueConverter::convertValues($row, $columnDefinitions); |
| 28 | 28 | } |
| 29 | - if($callback !== null) { |
|
| 29 | + if ($callback !== null) { |
|
| 30 | 30 | $result = $callback($row); |
| 31 | - if($result instanceof DBIgnoreRow) { |
|
| 31 | + if ($result instanceof DBIgnoreRow) { |
|
| 32 | 32 | // Do nothing in this case |
| 33 | - } elseif($result !== null) { |
|
| 33 | + } elseif ($result !== null) { |
|
| 34 | 34 | yield $result; |
| 35 | 35 | } else { |
| 36 | 36 | yield $row; |
@@ -46,12 +46,12 @@ discard block |
||
| 46 | 46 | * @return $this |
| 47 | 47 | */ |
| 48 | 48 | public function setFetchMode($mode, $arg0 = null, array $arg1 = null) { |
| 49 | - if($arg1 !== null) { |
|
| 49 | + if ($arg1 !== null) { |
|
| 50 | 50 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
| 51 | 51 | $this->statement->setFetchMode($mode, $arg0, $arg1); |
| 52 | 52 | return $this; |
| 53 | 53 | } |
| 54 | - if($arg0 !== null) { |
|
| 54 | + if ($arg0 !== null) { |
|
| 55 | 55 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
| 56 | 56 | $this->statement->setFetchMode($mode, $arg0); |
| 57 | 57 | return $this; |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $timer = microtime(true); |
| 71 | 71 | $response = $this->statement->execute($params); |
| 72 | 72 | $this->queryLoggers->log($this->query, microtime(true)-$timer); |
| 73 | - if(!$response) { |
|
| 73 | + if (!$response) { |
|
| 74 | 74 | throw new SqlException('Execution returned with "false".'); |
| 75 | 75 | } |
| 76 | 76 | }); |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | */ |
| 86 | 86 | public function fetchAll($fetchStyle = null, $fetchArgument = null, array $ctorArgs = []) { |
| 87 | 87 | return $this->exceptionHandler(function() use ($fetchStyle, $fetchArgument, $ctorArgs) { |
| 88 | - if($fetchArgument !== null) { |
|
| 88 | + if ($fetchArgument !== null) { |
|
| 89 | 89 | return $this->statement->fetchAll($fetchStyle, $fetchArgument, $ctorArgs); |
| 90 | 90 | } |
| 91 | 91 | return $this->statement->fetchAll($fetchStyle); |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | /** |
| 183 | - * @return bool |
|
| 183 | + * @return integer |
|
| 184 | 184 | */ |
| 185 | 185 | public function getFoundRows() { |
| 186 | 186 | return $this->foundRows; |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | /** |
| 229 | 229 | * @param Closure $callback |
| 230 | 230 | * @param int $mode |
| 231 | - * @param mixed $arg0 |
|
| 231 | + * @param string $arg0 |
|
| 232 | 232 | * @return mixed |
| 233 | 233 | * @throws \Exception |
| 234 | 234 | */ |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | /** |
| 263 | 263 | * @param Closure $callback |
| 264 | 264 | * @param int $mode |
| 265 | - * @param mixed $arg0 |
|
| 265 | + * @param string $arg0 |
|
| 266 | 266 | * @return Generator|YieldPolyfillIterator|mixed[] |
| 267 | 267 | */ |
| 268 | 268 | private function fetchLazy(Closure $callback = null, $mode, $arg0 = null) { |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | /** |
| 283 | 283 | * @param Closure $callback |
| 284 | 284 | * @param int $mode |
| 285 | - * @param mixed $arg0 |
|
| 285 | + * @param null|string $arg0 |
|
| 286 | 286 | * @param Closure $resultValidator |
| 287 | 287 | * @return mixed |
| 288 | 288 | * @throws \Exception |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | * @throws \Exception |
| 81 | 81 | */ |
| 82 | 82 | public function fetchRow(Closure $callback = null) { |
| 83 | - return $this->fetch($callback, PDO::FETCH_ASSOC, null, function ($row) { |
|
| 83 | + return $this->fetch($callback, PDO::FETCH_ASSOC, null, function($row) { |
|
| 84 | 84 | return ['valid' => is_array($row), 'default' => []]; |
| 85 | 85 | }); |
| 86 | 86 | } |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | * @throws \Exception |
| 112 | 112 | */ |
| 113 | 113 | public function fetchObject($className, Closure $callback = null) { |
| 114 | - return $this->fetch($callback, PDO::FETCH_CLASS, $className, function ($row) { |
|
| 114 | + return $this->fetch($callback, PDO::FETCH_CLASS, $className, function($row) { |
|
| 115 | 115 | return ['valid' => is_object($row), 'default' => null]; |
| 116 | 116 | }); |
| 117 | 117 | } |
@@ -121,11 +121,11 @@ discard block |
||
| 121 | 121 | * @return mixed[] |
| 122 | 122 | */ |
| 123 | 123 | public function fetchKeyValue($treatValueAsArray = false) { |
| 124 | - return $this->createTempStatement(function (QueryStatement $statement) use ($treatValueAsArray) { |
|
| 125 | - if($treatValueAsArray) { |
|
| 124 | + return $this->createTempStatement(function(QueryStatement $statement) use ($treatValueAsArray) { |
|
| 125 | + if ($treatValueAsArray) { |
|
| 126 | 126 | $rows = $statement->fetchAll(\PDO::FETCH_ASSOC); |
| 127 | 127 | $result = array(); |
| 128 | - foreach($rows as $row) { |
|
| 128 | + foreach ($rows as $row) { |
|
| 129 | 129 | list($key) = array_values($row); |
| 130 | 130 | $result[$key] = $row; |
| 131 | 131 | } |
@@ -142,11 +142,11 @@ discard block |
||
| 142 | 142 | public function fetchGroups(array $fields) { |
| 143 | 143 | $rows = $this->fetchRows(); |
| 144 | 144 | $result = array(); |
| 145 | - foreach($rows as $row) { |
|
| 145 | + foreach ($rows as $row) { |
|
| 146 | 146 | $tmp = &$result; |
| 147 | - foreach($fields as $field) { |
|
| 147 | + foreach ($fields as $field) { |
|
| 148 | 148 | $value = $row[$field]; |
| 149 | - if(!array_key_exists($value, $tmp)) { |
|
| 149 | + if (!array_key_exists($value, $tmp)) { |
|
| 150 | 150 | $tmp[$value] = []; |
| 151 | 151 | } |
| 152 | 152 | $tmp = &$tmp[$value]; |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | * @return string[] |
| 161 | 161 | */ |
| 162 | 162 | public function fetchArray() { |
| 163 | - return $this->createTempStatement(function (QueryStatement $stmt) { |
|
| 163 | + return $this->createTempStatement(function(QueryStatement $stmt) { |
|
| 164 | 164 | return $stmt->fetchAll(\PDO::FETCH_COLUMN); |
| 165 | 165 | }); |
| 166 | 166 | } |
@@ -170,9 +170,9 @@ discard block |
||
| 170 | 170 | * @return null|bool|string|int|float |
| 171 | 171 | */ |
| 172 | 172 | public function fetchValue($default = null) { |
| 173 | - return $this->createTempStatement(function (QueryStatement $stmt) use ($default) { |
|
| 173 | + return $this->createTempStatement(function(QueryStatement $stmt) use ($default) { |
|
| 174 | 174 | $result = $stmt->fetch(\PDO::FETCH_NUM); |
| 175 | - if($result !== false) { |
|
| 175 | + if ($result !== false) { |
|
| 176 | 176 | return $result[0]; |
| 177 | 177 | } |
| 178 | 178 | return $default; |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | $query = $this->__toString(); |
| 213 | 213 | $statement = $db->prepare($query); |
| 214 | 214 | $statement->execute($this->values); |
| 215 | - if($this->getCalcFoundRows()) { |
|
| 215 | + if ($this->getCalcFoundRows()) { |
|
| 216 | 216 | $this->foundRows = (int) $db->query('SELECT FOUND_ROWS()')->fetchColumn(); |
| 217 | 217 | } |
| 218 | 218 | return $statement; |
@@ -233,20 +233,20 @@ discard block |
||
| 233 | 233 | * @throws \Exception |
| 234 | 234 | */ |
| 235 | 235 | private function fetchAll(Closure $callback = null, $mode, $arg0 = null) { |
| 236 | - return $this->createTempStatement(function (QueryStatement $statement) use ($callback, $mode, $arg0) { |
|
| 236 | + return $this->createTempStatement(function(QueryStatement $statement) use ($callback, $mode, $arg0) { |
|
| 237 | 237 | $statement->setFetchMode($mode, $arg0); |
| 238 | 238 | $data = $statement->fetchAll(); |
| 239 | - if($this->preserveTypes) { |
|
| 239 | + if ($this->preserveTypes) { |
|
| 240 | 240 | $columnDefinitions = FieldTypeProvider::getFieldTypes($statement); |
| 241 | - foreach($data as &$row) { |
|
| 241 | + foreach ($data as &$row) { |
|
| 242 | 242 | $row = FieldValueConverter::convertValues($row, $columnDefinitions); |
| 243 | 243 | } |
| 244 | 244 | } |
| 245 | - if($callback !== null) { |
|
| 246 | - return call_user_func(function ($resultData = []) use ($data, $callback) { |
|
| 247 | - foreach($data as $row) { |
|
| 245 | + if ($callback !== null) { |
|
| 246 | + return call_user_func(function($resultData = []) use ($data, $callback) { |
|
| 247 | + foreach ($data as $row) { |
|
| 248 | 248 | $result = $callback($row); |
| 249 | - if($result !== null && !($result instanceof DBIgnoreRow)) { |
|
| 249 | + if ($result !== null && !($result instanceof DBIgnoreRow)) { |
|
| 250 | 250 | $resultData[] = $result; |
| 251 | 251 | } else { |
| 252 | 252 | $resultData[] = $row; |
@@ -266,8 +266,8 @@ discard block |
||
| 266 | 266 | * @return Generator|YieldPolyfillIterator|mixed[] |
| 267 | 267 | */ |
| 268 | 268 | private function fetchLazy(Closure $callback = null, $mode, $arg0 = null) { |
| 269 | - if(version_compare(PHP_VERSION, '5.5', '<')) { |
|
| 270 | - return new YieldPolyfillIterator($callback, $this->preserveTypes, function () use ($mode, $arg0) { |
|
| 269 | + if (version_compare(PHP_VERSION, '5.5', '<')) { |
|
| 270 | + return new YieldPolyfillIterator($callback, $this->preserveTypes, function() use ($mode, $arg0) { |
|
| 271 | 271 | $statement = $this->createStatement(); |
| 272 | 272 | $statement->setFetchMode($mode, $arg0); |
| 273 | 273 | return $statement; |
@@ -288,20 +288,20 @@ discard block |
||
| 288 | 288 | * @throws \Exception |
| 289 | 289 | */ |
| 290 | 290 | private function fetch(Closure $callback = null, $mode, $arg0 = null, Closure $resultValidator = null) { |
| 291 | - return $this->createTempStatement(function (QueryStatement $statement) use ($callback, $mode, $arg0, $resultValidator) { |
|
| 291 | + return $this->createTempStatement(function(QueryStatement $statement) use ($callback, $mode, $arg0, $resultValidator) { |
|
| 292 | 292 | $statement->setFetchMode($mode, $arg0); |
| 293 | 293 | $row = $statement->fetch(); |
| 294 | 294 | $result = $resultValidator($row); |
| 295 | - if(!$result['valid']) { |
|
| 295 | + if (!$result['valid']) { |
|
| 296 | 296 | return $result['default']; |
| 297 | 297 | } |
| 298 | - if($this->preserveTypes) { |
|
| 298 | + if ($this->preserveTypes) { |
|
| 299 | 299 | $columnDefinitions = FieldTypeProvider::getFieldTypes($statement); |
| 300 | 300 | $row = FieldValueConverter::convertValues($row, $columnDefinitions); |
| 301 | 301 | } |
| 302 | - if($callback !== null) { |
|
| 302 | + if ($callback !== null) { |
|
| 303 | 303 | $result = $callback($row); |
| 304 | - if($result !== null) { |
|
| 304 | + if ($result !== null) { |
|
| 305 | 305 | $row = $result; |
| 306 | 306 | } |
| 307 | 307 | } |
@@ -12,28 +12,28 @@ |
||
| 12 | 12 | * @return string |
| 13 | 13 | */ |
| 14 | 14 | protected function buildTableName($alias, $name) { |
| 15 | - if(is_object($name)) { |
|
| 15 | + if (is_object($name)) { |
|
| 16 | 16 | $name = (string) $name; |
| 17 | 17 | $lines = explode("\n", $name); |
| 18 | - foreach($lines as &$line) { |
|
| 18 | + foreach ($lines as &$line) { |
|
| 19 | 19 | $line = "\t{$line}"; |
| 20 | 20 | } |
| 21 | 21 | $name = join("\n", $lines); |
| 22 | - $name = '(' . trim(rtrim(trim($name), ';')) . ')'; |
|
| 22 | + $name = '('.trim(rtrim(trim($name), ';')).')'; |
|
| 23 | 23 | } |
| 24 | - if(is_array($name)) { |
|
| 24 | + if (is_array($name)) { |
|
| 25 | 25 | $parts = []; |
| 26 | - foreach($name as $bucket) { |
|
| 26 | + foreach ($name as $bucket) { |
|
| 27 | 27 | $values = []; |
| 28 | - foreach($bucket as $field => $value) { |
|
| 28 | + foreach ($bucket as $field => $value) { |
|
| 29 | 29 | $values[] = sprintf('%s AS %s', $this->db()->quote($value), $this->db()->quoteField($field)); |
| 30 | 30 | } |
| 31 | 31 | $parts[] = sprintf("SELECT %s", join(', ', $values)); |
| 32 | 32 | } |
| 33 | - $name = '(' . join("\n\tUNION\n\t", $parts) . ')'; |
|
| 33 | + $name = '('.join("\n\tUNION\n\t", $parts).')'; |
|
| 34 | 34 | } |
| 35 | 35 | $name = $this->aliasReplacer()->replace($name); |
| 36 | - if($alias !== null) { |
|
| 36 | + if ($alias !== null) { |
|
| 37 | 37 | return sprintf("%s %s", $name, $alias); |
| 38 | 38 | } |
| 39 | 39 | return $name; |