Passed
Push — master ( fddfe5...a6d7b3 )
by y
02:19
created
src/DB.php 2 patches
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
      * @param string $password
71 71
      * @param array $options
72 72
      */
73
-    public function __construct ($dsn, $username = null, $password = null, array $options = []) {
73
+    public function __construct($dsn, $username = null, $password = null, array $options = []) {
74 74
         $options += [
75 75
             self::ATTR_STATEMENT_CLASS => [Statement::class, [$this]]
76 76
         ];
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 
85 85
         if ($this->isSQLite()) {
86 86
             // polyfill sqlite functions
87
-            $this->sqliteCreateFunctions([ // deterministic functions
87
+            $this->sqliteCreateFunctions([// deterministic functions
88 88
                 // https://www.sqlite.org/lang_mathfunc.html
89 89
                 'ACOS' => 'acos',
90 90
                 'ASIN' => 'asin',
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
                 'SIGN' => fn($x) => ($x > 0) - ($x < 0),
111 111
             ]);
112 112
 
113
-            $this->sqliteCreateFunctions([ // non-deterministic
113
+            $this->sqliteCreateFunctions([// non-deterministic
114 114
                 'RAND' => fn() => mt_rand(0, 1),
115 115
             ], false);
116 116
         }
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
      *
122 122
      * @return string
123 123
      */
124
-    final public function __toString () {
124
+    final public function __toString() {
125 125
         return $this->driver;
126 126
     }
127 127
 
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
      *
133 133
      * @return true
134 134
      */
135
-    public function beginTransaction () {
135
+    public function beginTransaction() {
136 136
         assert($this->transactions >= 0);
137 137
         if ($this->transactions === 0) {
138 138
             $this->logger->__invoke("BEGIN TRANSACTION");
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
      *
153 153
      * @return true
154 154
      */
155
-    public function commit () {
155
+    public function commit() {
156 156
         assert($this->transactions > 0);
157 157
         if ($this->transactions === 1) {
158 158
             $this->logger->__invoke("COMMIT TRANSACTION");
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
      * @param string $sql
173 173
      * @return int
174 174
      */
175
-    public function exec ($sql): int {
175
+    public function exec($sql): int {
176 176
         $this->logger->__invoke($sql);
177 177
         return parent::exec($sql);
178 178
     }
@@ -188,14 +188,14 @@  discard block
 block discarded – undo
188 188
      * @param mixed ...$args
189 189
      * @return mixed
190 190
      */
191
-    public function factory (string $class, ...$args) {
191
+    public function factory(string $class, ...$args) {
192 192
         return new $class($this, ...$args);
193 193
     }
194 194
 
195 195
     /**
196 196
      * @return string
197 197
      */
198
-    final public function getDriver (): string {
198
+    final public function getDriver(): string {
199 199
         return $this->driver;
200 200
     }
201 201
 
@@ -205,14 +205,14 @@  discard block
 block discarded – undo
205 205
      * @param string $interface
206 206
      * @return Junction
207 207
      */
208
-    public function getJunction ($interface) {
208
+    public function getJunction($interface) {
209 209
         return $this->junctions[$interface] ??= Junction::fromInterface($this, $interface);
210 210
     }
211 211
 
212 212
     /**
213 213
      * @return Closure
214 214
      */
215
-    public function getLogger () {
215
+    public function getLogger() {
216 216
         return $this->logger;
217 217
     }
218 218
 
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
      * @param string|EntityInterface $class
223 223
      * @return Record
224 224
      */
225
-    public function getRecord ($class) {
225
+    public function getRecord($class) {
226 226
         if (is_object($class)) {
227 227
             $class = get_class($class);
228 228
         }
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
      * @param string $name
234 234
      * @return null|Table
235 235
      */
236
-    public function getTable (string $name) {
236
+    public function getTable(string $name) {
237 237
         if (!isset($this->tables[$name])) {
238 238
             if ($this->isSQLite()) {
239 239
                 $info = $this->query("PRAGMA table_info({$this->quote($name)})")->fetchAll();
@@ -255,21 +255,21 @@  discard block
 block discarded – undo
255 255
     /**
256 256
      * @return bool
257 257
      */
258
-    final public function isMySQL (): bool {
258
+    final public function isMySQL(): bool {
259 259
         return $this->driver === 'mysql';
260 260
     }
261 261
 
262 262
     /**
263 263
      * @return bool
264 264
      */
265
-    final public function isPostgreSQL (): bool {
265
+    final public function isPostgreSQL(): bool {
266 266
         return $this->driver === 'pgsql';
267 267
     }
268 268
 
269 269
     /**
270 270
      * @return bool
271 271
      */
272
-    final public function isSQLite (): bool {
272
+    final public function isSQLite(): bool {
273 273
         return $this->driver === 'sqlite';
274 274
     }
275 275
 
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
      * @param mixed $b
291 291
      * @return Predicate
292 292
      */
293
-    public function match ($a, $b) {
293
+    public function match($a, $b) {
294 294
         if ($b instanceof Closure) {
295 295
             return $b->__invoke($a, $this);
296 296
         }
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
      *
312 312
      * @return Transaction
313 313
      */
314
-    public function newTransaction () {
314
+    public function newTransaction() {
315 315
         return Transaction::factory($this);
316 316
     }
317 317
 
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
      * @param string $table
322 322
      * @return bool
323 323
      */
324
-    final public function offsetExists ($table): bool {
324
+    final public function offsetExists($table): bool {
325 325
         return (bool)$this->getTable($table);
326 326
     }
327 327
 
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
      * @param string $table
332 332
      * @return null|Table
333 333
      */
334
-    final public function offsetGet ($table) {
334
+    final public function offsetGet($table) {
335 335
         return $this->getTable($table);
336 336
     }
337 337
 
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
      * @param $value
341 341
      * @throws LogicException
342 342
      */
343
-    final public function offsetSet ($offset, $value) {
343
+    final public function offsetSet($offset, $value) {
344 344
         throw new LogicException('Raw table access is immutable.');
345 345
     }
346 346
 
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
      * @param $offset
349 349
      * @throws LogicException
350 350
      */
351
-    final public function offsetUnset ($offset) {
351
+    final public function offsetUnset($offset) {
352 352
         throw new LogicException('Raw table access is immutable.');
353 353
     }
354 354
 
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
      *
358 358
      * @return Num
359 359
      */
360
-    public function pi () {
360
+    public function pi() {
361 361
         return Num::factory($this, "PI()");
362 362
     }
363 363
 
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
      * @param array $options
369 369
      * @return Statement
370 370
      */
371
-    public function prepare ($sql, $options = []) {
371
+    public function prepare($sql, $options = []) {
372 372
         $this->logger->__invoke($sql);
373 373
         /** @var Statement $statement */
374 374
         $statement = parent::prepare($sql, $options);
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
      * @param array $ctorargs Optional.
385 385
      * @return Statement
386 386
      */
387
-    public function query ($sql, $mode = PDO::ATTR_DEFAULT_FETCH_MODE, $arg3 = null, array $ctorargs = []) {
387
+    public function query($sql, $mode = PDO::ATTR_DEFAULT_FETCH_MODE, $arg3 = null, array $ctorargs = []) {
388 388
         $this->logger->__invoke($sql);
389 389
         /** @var Statement $statement */
390 390
         $statement = parent::query(...func_get_args());
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
      * @param int $type Ignored.
403 403
      * @return string|ExpressionInterface
404 404
      */
405
-    public function quote ($value, $type = self::PARAM_STR) {
405
+    public function quote($value, $type = self::PARAM_STR) {
406 406
         if ($value instanceof ExpressionInterface) {
407 407
             return $value;
408 408
         }
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
      * @param array $values
423 423
      * @return string[]
424 424
      */
425
-    public function quoteArray (array $values) {
425
+    public function quoteArray(array $values) {
426 426
         return array_map([$this, 'quote'], $values);
427 427
     }
428 428
 
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
432 432
      * @param array $values
433 433
      * @return string
434 434
      */
435
-    public function quoteList (array $values): string {
435
+    public function quoteList(array $values): string {
436 436
         return implode(',', $this->quoteArray($values));
437 437
     }
438 438
 
@@ -441,7 +441,7 @@  discard block
 block discarded – undo
441 441
      *
442 442
      * @return Num
443 443
      */
444
-    public function rand () {
444
+    public function rand() {
445 445
         return Num::factory($this, "RAND()");
446 446
     }
447 447
 
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
452 452
      *
453 453
      * @return true
454 454
      */
455
-    public function rollBack () {
455
+    public function rollBack() {
456 456
         assert($this->transactions > 0);
457 457
         if ($this->transactions === 1) {
458 458
             $this->logger->__invoke("ROLLBACK TRANSACTION");
@@ -472,7 +472,7 @@  discard block
 block discarded – undo
472 472
      * @param EntityInterface $entity
473 473
      * @return int ID
474 474
      */
475
-    public function save (EntityInterface $entity): int {
475
+    public function save(EntityInterface $entity): int {
476 476
         return $this->getRecord($entity)->save($entity);
477 477
     }
478 478
 
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
481 481
      * @param Junction $junction
482 482
      * @return $this
483 483
      */
484
-    public function setJunction (string $interface, Junction $junction) {
484
+    public function setJunction(string $interface, Junction $junction) {
485 485
         $this->junctions[$interface] = $junction;
486 486
         return $this;
487 487
     }
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
      * @param Closure $logger
491 491
      * @return $this
492 492
      */
493
-    public function setLogger (Closure $logger) {
493
+    public function setLogger(Closure $logger) {
494 494
         $this->logger = $logger;
495 495
         return $this;
496 496
     }
@@ -500,7 +500,7 @@  discard block
 block discarded – undo
500 500
      * @param Record $record
501 501
      * @return $this
502 502
      */
503
-    public function setRecord (string $class, Record $record) {
503
+    public function setRecord(string $class, Record $record) {
504 504
         $this->records[$class] = $record;
505 505
         return $this;
506 506
     }
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
      * @param callable[] $callbacks Keyed by function name.
510 510
      * @param bool $deterministic Whether the callbacks aren't random / are without side-effects.
511 511
      */
512
-    public function sqliteCreateFunctions (array $callbacks, bool $deterministic = true): void {
512
+    public function sqliteCreateFunctions(array $callbacks, bool $deterministic = true): void {
513 513
         $deterministic = $deterministic ? self::SQLITE_DETERMINISTIC : 0;
514 514
         foreach ($callbacks as $name => $callback) {
515 515
             $argc = (new ReflectionFunction($callback))->getNumberOfRequiredParameters();
@@ -525,7 +525,7 @@  discard block
 block discarded – undo
525 525
      * @param callable $work
526 526
      * @return mixed The return value of `$work`
527 527
      */
528
-    public function transact (callable $work) {
528
+    public function transact(callable $work) {
529 529
         $transaction = $this->newTransaction();
530 530
         $return = call_user_func($work);
531 531
         $transaction->commit();
Please login to merge, or discard this patch.
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -137,8 +137,7 @@  discard block
 block discarded – undo
137 137
         if ($this->transactions === 0) {
138 138
             $this->logger->__invoke("BEGIN TRANSACTION");
139 139
             parent::beginTransaction();
140
-        }
141
-        else {
140
+        } else {
142 141
             $this->exec("SAVEPOINT SAVEPOINT_{$this->transactions}");
143 142
         }
144 143
         $this->transactions++;
@@ -157,8 +156,7 @@  discard block
 block discarded – undo
157 156
         if ($this->transactions === 1) {
158 157
             $this->logger->__invoke("COMMIT TRANSACTION");
159 158
             parent::commit();
160
-        }
161
-        else {
159
+        } else {
162 160
             $savepoint = $this->transactions - 1;
163 161
             $this->exec("RELEASE SAVEPOINT SAVEPOINT_{$savepoint}");
164 162
         }
@@ -238,8 +236,7 @@  discard block
 block discarded – undo
238 236
             if ($this->isSQLite()) {
239 237
                 $info = $this->query("PRAGMA table_info({$this->quote($name)})")->fetchAll();
240 238
                 $cols = array_column($info, 'name');
241
-            }
242
-            else {
239
+            } else {
243 240
                 $cols = $this->query(
244 241
                     "SELECT column_name FROM information_schema.tables WHERE table_name = {$this->quote($name)}"
245 242
                 )->fetchAll(self::FETCH_COLUMN);
@@ -457,8 +454,7 @@  discard block
 block discarded – undo
457 454
         if ($this->transactions === 1) {
458 455
             $this->logger->__invoke("ROLLBACK TRANSACTION");
459 456
             parent::rollBack();
460
-        }
461
-        else {
457
+        } else {
462 458
             $savepoint = $this->transactions - 1;
463 459
             $this->exec("ROLLBACK TO SAVEPOINT SAVEPOINT_{$savepoint}");
464 460
         }
Please login to merge, or discard this patch.
src/DB/Transaction.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
      *
34 34
      * @param DB $db
35 35
      */
36
-    public function __construct (DB $db) {
36
+    public function __construct(DB $db) {
37 37
         $this->db = $db;
38 38
         $db->beginTransaction();
39 39
     }
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     /**
42 42
      * Rolls back if the instance wasn't committed.
43 43
      */
44
-    public function __destruct () {
44
+    public function __destruct() {
45 45
         if (!$this->committed) {
46 46
             $this->db->rollBack();
47 47
         }
@@ -54,14 +54,14 @@  discard block
 block discarded – undo
54 54
      *
55 55
      * @return true
56 56
      */
57
-    public function commit (): bool {
57
+    public function commit(): bool {
58 58
         return $this->committed or $this->committed = $this->db->commit();
59 59
     }
60 60
 
61 61
     /**
62 62
      * @return bool
63 63
      */
64
-    final public function wasCommitted (): bool {
64
+    final public function wasCommitted(): bool {
65 65
         return $this->committed;
66 66
     }
67 67
 }
68 68
\ No newline at end of file
Please login to merge, or discard this patch.
src/DB/Select.php 2 patches
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
      * @param string|AbstractTable $table
125 125
      * @param string[] $columns
126 126
      */
127
-    public function __construct (DB $db, $table, array $columns = ['*']) {
127
+    public function __construct(DB $db, $table, array $columns = ['*']) {
128 128
         static $autoAlias = 0;
129 129
         $autoAlias++;
130 130
         parent::__construct($db);
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
      * @param array $args
152 152
      * @return Statement
153 153
      */
154
-    public function __invoke (array $args = []) {
154
+    public function __invoke(array $args = []) {
155 155
         return $this->execute($args);
156 156
     }
157 157
 
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
      *
161 161
      * @return string
162 162
      */
163
-    final public function __toString () {
163
+    final public function __toString() {
164 164
         return $this->alias;
165 165
     }
166 166
 
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
      * @param array $args Execution arguments.
171 171
      * @return int
172 172
      */
173
-    public function count (array $args = []): int {
173
+    public function count(array $args = []): int {
174 174
         $clone = clone $this;
175 175
         $clone->_columns = 'COUNT(*)';
176 176
         $clone->_order = '';
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
      * @param array $args
184 184
      * @return Statement
185 185
      */
186
-    public function execute (array $args = []) {
186
+    public function execute(array $args = []) {
187 187
         if (empty($args)) {
188 188
             return $this->db->query($this->toSql());
189 189
         }
@@ -198,14 +198,14 @@  discard block
 block discarded – undo
198 198
      * @param array $args Execution arguments.
199 199
      * @return array
200 200
      */
201
-    public function getAll (array $args = []): array {
201
+    public function getAll(array $args = []): array {
202 202
         return iterator_to_array($this->fetcher->__invoke($this->execute($args)));
203 203
     }
204 204
 
205 205
     /**
206 206
      * @return Column[]
207 207
      */
208
-    public function getColumns () {
208
+    public function getColumns() {
209 209
         return $this->refs;
210 210
     }
211 211
 
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
      * @param array $args Execution arguments.
219 219
      * @return Generator
220 220
      */
221
-    public function getEach (array $args = []) {
221
+    public function getEach(array $args = []) {
222 222
         yield from $this->fetcher->__invoke($this->execute($args));
223 223
     }
224 224
 
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
      * @param array $args
231 231
      * @return mixed
232 232
      */
233
-    public function getFirst (array $args = []) {
233
+    public function getFirst(array $args = []) {
234 234
         return $this->getEach($args)->current();
235 235
     }
236 236
 
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
      *
242 242
      * @return Generator
243 243
      */
244
-    public function getIterator () {
244
+    public function getIterator() {
245 245
         yield from $this->getEach();
246 246
     }
247 247
 
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
      *
252 252
      * @return mixed
253 253
      */
254
-    public function getResult (array $args = []) {
254
+    public function getResult(array $args = []) {
255 255
         return $this->execute($args)->fetchColumn();
256 256
     }
257 257
 
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
      * @param string $column
262 262
      * @return $this
263 263
      */
264
-    public function group (string $column) {
264
+    public function group(string $column) {
265 265
         if (!strlen($this->_group)) {
266 266
             $this->_group = " GROUP BY {$column}";
267 267
         }
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
      * @param string ...$conditions
278 278
      * @return $this
279 279
      */
280
-    public function having (string ...$conditions) {
280
+    public function having(string ...$conditions) {
281 281
         assert(count($conditions) > 0);
282 282
         $conditions = implode(' AND ', $conditions);
283 283
         if (!strlen($this->_having)) {
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
      * @param Select $select
298 298
      * @return $this
299 299
      */
300
-    public function intersect (Select $select) {
300
+    public function intersect(Select $select) {
301 301
         if ($this->db->isMySQL()) {
302 302
             // to be standards compliant, this hack must fail if they don't have the same cols.
303 303
             assert(count($this->refs) === count($select->refs) and !array_diff_key($this->refs, $select->refs));
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
      *
319 319
      * @return Predicate
320 320
      */
321
-    public function isEmpty () {
321
+    public function isEmpty() {
322 322
         return Predicate::factory($this->db, "NOT EXISTS ({$this->toSql()})");
323 323
     }
324 324
 
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
      *
328 328
      * @return Predicate
329 329
      */
330
-    public function isNotEmpty () {
330
+    public function isNotEmpty() {
331 331
         return Predicate::factory($this->db, "EXISTS ({$this->toSql()})");
332 332
     }
333 333
 
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
      * @param string ...$conditions
339 339
      * @return $this
340 340
      */
341
-    public function join ($table, string ...$conditions) {
341
+    public function join($table, string ...$conditions) {
342 342
         assert(count($conditions) > 0);
343 343
         if ($table instanceof Select) {
344 344
             $table = $table->toSubquery();
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
      * @param string ...$conditions
356 356
      * @return $this
357 357
      */
358
-    public function joinLeft ($table, string ...$conditions) {
358
+    public function joinLeft($table, string ...$conditions) {
359 359
         assert(count($conditions) > 0);
360 360
         if ($table instanceof Select) {
361 361
             $table = $table->toSubquery();
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
      * @param int $offset
373 373
      * @return $this
374 374
      */
375
-    public function limit (int $limit, int $offset = 0) {
375
+    public function limit(int $limit, int $offset = 0) {
376 376
         if ($limit == 0) {
377 377
             $this->_limit = '';
378 378
         }
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
      * @param int|string $ref Ordinal or reference name.
392 392
      * @return null|Column
393 393
      */
394
-    public function offsetGet ($ref) {
394
+    public function offsetGet($ref) {
395 395
         if (is_int($ref)) {
396 396
             return current(array_slice($this->refs, $ref, 1)) ?: null;
397 397
         }
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
      * @param string $order
405 405
      * @return $this
406 406
      */
407
-    public function order (string $order) {
407
+    public function order(string $order) {
408 408
         if (strlen($order)) {
409 409
             $order = " ORDER BY {$order}";
410 410
         }
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
     /**
416 416
      * @return Statement
417 417
      */
418
-    public function prepare () {
418
+    public function prepare() {
419 419
         return $this->db->prepare($this->toSql());
420 420
     }
421 421
 
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
      * @param string $alias
424 424
      * @return $this
425 425
      */
426
-    public function setAlias (string $alias) {
426
+    public function setAlias(string $alias) {
427 427
         $this->alias = $alias;
428 428
         foreach ($this->refs as $k => $column) {
429 429
             $this->refs[$k] = $column->setQualifier($alias);
@@ -440,7 +440,7 @@  discard block
 block discarded – undo
440 440
      * @param string[] $expressions Keyed by alias if applicable.
441 441
      * @return $this
442 442
      */
443
-    public function setColumns (array $expressions = ['*']) {
443
+    public function setColumns(array $expressions = ['*']) {
444 444
         if ($expressions === ['*']) {
445 445
             $expressions = array_keys($this->table->getColumns());
446 446
         }
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
      * @param Closure $fetcher
469 469
      * @return $this
470 470
      */
471
-    public function setFetcher (Closure $fetcher) {
471
+    public function setFetcher(Closure $fetcher) {
472 472
         $this->fetcher = $fetcher;
473 473
         return $this;
474 474
     }
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
      *
479 479
      * @return string
480 480
      */
481
-    public function toSql (): string {
481
+    public function toSql(): string {
482 482
         $sql = "SELECT {$this->_columns} FROM {$this->_table}";
483 483
         $sql .= $this->_join;
484 484
         $sql .= $this->_where;
@@ -495,7 +495,7 @@  discard block
 block discarded – undo
495 495
      *
496 496
      * @return string
497 497
      */
498
-    public function toSubquery (): string {
498
+    public function toSubquery(): string {
499 499
         return "({$this->toSql()}) AS {$this->alias}";
500 500
     }
501 501
 
@@ -505,7 +505,7 @@  discard block
 block discarded – undo
505 505
      * @param Select $select
506 506
      * @return $this
507 507
      */
508
-    public function union (Select $select) {
508
+    public function union(Select $select) {
509 509
         $select = clone $select;
510 510
         $select->_order = '';
511 511
         $select->_limit = '';
@@ -519,7 +519,7 @@  discard block
 block discarded – undo
519 519
      * @param Select $select
520 520
      * @return $this
521 521
      */
522
-    public function unionAll (Select $select) {
522
+    public function unionAll(Select $select) {
523 523
         $select = clone $select;
524 524
         $select->_order = '';
525 525
         $select->_limit = '';
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
      * @param string ...$conditions
534 534
      * @return $this
535 535
      */
536
-    public function where (string ...$conditions) {
536
+    public function where(string ...$conditions) {
537 537
         assert(count($conditions) > 0);
538 538
         $conditions = implode(' AND ', $conditions);
539 539
         if (!strlen($this->_where)) {
Please login to merge, or discard this patch.
Braces   +6 added lines, -12 removed lines patch added patch discarded remove patch
@@ -131,8 +131,7 @@  discard block
 block discarded – undo
131 131
         if ($table instanceof Select) {
132 132
             $this->_table = $table->toSubquery();
133 133
             $this->alias = "_anon{$autoAlias}_{$table->alias}";
134
-        }
135
-        else {
134
+        } else {
136 135
             if (is_string($table)) {
137 136
                 $table = $db->getTable($table);
138 137
                 assert(isset($table));
@@ -264,8 +263,7 @@  discard block
 block discarded – undo
264 263
     public function group (string $column) {
265 264
         if (!strlen($this->_group)) {
266 265
             $this->_group = " GROUP BY {$column}";
267
-        }
268
-        else {
266
+        } else {
269 267
             $this->_group .= ", {$column}";
270 268
         }
271 269
         return $this;
@@ -282,8 +280,7 @@  discard block
 block discarded – undo
282 280
         $conditions = implode(' AND ', $conditions);
283 281
         if (!strlen($this->_having)) {
284 282
             $this->_having = " HAVING {$conditions}";
285
-        }
286
-        else {
283
+        } else {
287 284
             $this->_having .= " AND {$conditions}";
288 285
         }
289 286
         return $this;
@@ -375,8 +372,7 @@  discard block
 block discarded – undo
375 372
     public function limit (int $limit, int $offset = 0) {
376 373
         if ($limit == 0) {
377 374
             $this->_limit = '';
378
-        }
379
-        else {
375
+        } else {
380 376
             $this->_limit = " LIMIT {$limit}";
381 377
             if ($offset > 1) {
382 378
                 $this->_limit .= " OFFSET {$offset}";
@@ -451,8 +447,7 @@  discard block
 block discarded – undo
451 447
             $name = $match['name'] ?? null;
452 448
             if (is_int($alias)) {
453 449
                 $alias = $name;
454
-            }
455
-            elseif ($alias !== $name) {
450
+            } elseif ($alias !== $name) {
456 451
                 $expr .= " AS {$alias}";
457 452
             }
458 453
             if (isset($alias)) {
@@ -538,8 +533,7 @@  discard block
 block discarded – undo
538 533
         $conditions = implode(' AND ', $conditions);
539 534
         if (!strlen($this->_where)) {
540 535
             $this->_where = " WHERE {$conditions}";
541
-        }
542
-        else {
536
+        } else {
543 537
             $this->_where .= " AND {$conditions}";
544 538
         }
545 539
         return $this;
Please login to merge, or discard this patch.
src/DB/Table.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
      * @param string $name
43 43
      * @param string[] $columns
44 44
      */
45
-    public function __construct (DB $db, string $name, array $columns) {
45
+    public function __construct(DB $db, string $name, array $columns) {
46 46
         parent::__construct($db);
47 47
         $this->name = $name;
48 48
         foreach ($columns as $column) {
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
      *
56 56
      * @return string
57 57
      */
58
-    final public function __toString () {
58
+    final public function __toString() {
59 59
         return $this->name;
60 60
     }
61 61
 
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
      * @param array $values
66 66
      * @return int Rows affected.
67 67
      */
68
-    public function apply (array $values): int {
68
+    public function apply(array $values): int {
69 69
         $columns = implode(',', array_keys($values));
70 70
         $values = $this->db->quoteList($values);
71 71
         if ($this->db->isSQLite()) {
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
      * @param Closure $prepare `():Statement`
86 86
      * @return Statement
87 87
      */
88
-    protected function cache (string $key, Closure $prepare) {
88
+    protected function cache(string $key, Closure $prepare) {
89 89
         return $this->_cache[$key] ??= $prepare->__invoke();
90 90
     }
91 91
 
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
      * @param array $match `[a => b]`
94 94
      * @return int
95 95
      */
96
-    public function count (array $match = []) {
96
+    public function count(array $match = []) {
97 97
         $select = $this->select(['COUNT(*)']);
98 98
         foreach ($match as $a => $b) {
99 99
             $select->where($this->db->match($this[$a] ?? $a, $b));
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
      * @param array $match
110 110
      * @return int Rows affected.
111 111
      */
112
-    public function delete (array $match): int {
112
+    public function delete(array $match): int {
113 113
         foreach ($match as $a => $b) {
114 114
             $match[$a] = $this->db->match($this[$a] ?? $a, $b);
115 115
         }
@@ -120,14 +120,14 @@  discard block
 block discarded – undo
120 120
     /**
121 121
      * @return Column[]
122 122
      */
123
-    public function getColumns () {
123
+    public function getColumns() {
124 124
         return $this->columns;
125 125
     }
126 126
 
127 127
     /**
128 128
      * @return string
129 129
      */
130
-    final public function getName (): string {
130
+    final public function getName(): string {
131 131
         return $this->name;
132 132
     }
133 133
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
      * @param array $values
138 138
      * @return Statement
139 139
      */
140
-    public function insert (array $values) {
140
+    public function insert(array $values) {
141 141
         $columns = implode(',', array_keys($values));
142 142
         $values = $this->db->quoteList($values);
143 143
         return $this->db->query("INSERT INTO {$this} ($columns) VALUES ($values)");
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
      * @param int|string $column
148 148
      * @return Column
149 149
      */
150
-    public function offsetGet ($column) {
150
+    public function offsetGet($column) {
151 151
         if (is_int($column)) {
152 152
             return current(array_slice($this->columns, $column, 1)) ?: null;
153 153
         }
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
      * @param string[] $columns
161 161
      * @return Select|array[]
162 162
      */
163
-    public function select (array $columns = ['*']) {
163
+    public function select(array $columns = ['*']) {
164 164
         return Select::factory($this->db, $this, $columns);
165 165
     }
166 166
 
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
      * @param string $name
171 171
      * @return Table
172 172
      */
173
-    public function setName (string $name) {
173
+    public function setName(string $name) {
174 174
         $clone = clone $this;
175 175
         $clone->name = $name;
176 176
         foreach ($this->columns as $name => $column) {
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
      * @param array $match
189 189
      * @return int Rows affected.
190 190
      */
191
-    public function update (array $values, array $match): int {
191
+    public function update(array $values, array $match): int {
192 192
         foreach ($this->db->quoteArray($values) as $key => $value) {
193 193
             $values[$key] = "{$key} = {$value}";
194 194
         }
Please login to merge, or discard this patch.
src/DB/AbstractTable.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -16,20 +16,20 @@  discard block
 block discarded – undo
16 16
      *
17 17
      * @return string
18 18
      */
19
-    abstract public function __toString ();
19
+    abstract public function __toString();
20 20
 
21 21
     /**
22 22
      * Columns keyed by name/alias.
23 23
      *
24 24
      * @return Column[]
25 25
      */
26
-    abstract public function getColumns ();
26
+    abstract public function getColumns();
27 27
 
28 28
     /**
29 29
      * @param int|string $column
30 30
      * @return null|Column
31 31
      */
32
-    abstract public function offsetGet ($column);
32
+    abstract public function offsetGet($column);
33 33
 
34 34
     /**
35 35
      * @var DB
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
     /**
40 40
      * @param DB $db
41 41
      */
42
-    public function __construct (DB $db) {
42
+    public function __construct(DB $db) {
43 43
         $this->db = $db;
44 44
     }
45 45
 
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
      * @param int|string $column
48 48
      * @return bool
49 49
      */
50
-    public function offsetExists ($column): bool {
50
+    public function offsetExists($column): bool {
51 51
         return $this->offsetGet($column) !== null;
52 52
     }
53 53
 
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
      * @param void $value
59 59
      * @throws Exception
60 60
      */
61
-    final public function offsetSet ($offset, $value): void {
61
+    final public function offsetSet($offset, $value): void {
62 62
         throw new Exception('Tables are immutable.');
63 63
     }
64 64
 
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
      * @param void $name
69 69
      * @throws Exception
70 70
      */
71
-    final public function offsetUnset ($name): void {
71
+    final public function offsetUnset($name): void {
72 72
         $this->offsetSet($name, null);
73 73
     }
74 74
 }
75 75
\ No newline at end of file
Please login to merge, or discard this patch.