@@ -64,8 +64,7 @@ |
||
| 64 | 64 | } |
| 65 | 65 | if ($arg === null or is_bool($arg)) { |
| 66 | 66 | $arg = ['' => 'NULL', 1 => 'TRUE', 0 => 'FALSE'][$arg]; |
| 67 | - } |
|
| 68 | - else { |
|
| 67 | + } else { |
|
| 69 | 68 | $arg = $this->db->quote($arg); |
| 70 | 69 | } |
| 71 | 70 | if ($this->db->isMySQL()) { |
@@ -85,8 +85,10 @@ |
||
| 85 | 85 | * @param string|ValueInterface $else |
| 86 | 86 | * @return $this |
| 87 | 87 | */ |
| 88 | - public function else ($else) { |
|
| 88 | + public function else { |
|
| 89 | + ($else) { |
|
| 89 | 90 | $this->else = isset($else) ? $this->db->quote($else) : null; |
| 91 | + } |
|
| 90 | 92 | return $this; |
| 91 | 93 | } |
| 92 | 94 | |
@@ -132,8 +132,7 @@ discard block |
||
| 132 | 132 | if ($table instanceof Select) { |
| 133 | 133 | $this->_table = $table->toSubquery(); |
| 134 | 134 | $this->alias = "_anon{$autoAlias}_{$table->alias}"; |
| 135 | - } |
|
| 136 | - else { |
|
| 135 | + } else { |
|
| 137 | 136 | if (is_string($table)) { |
| 138 | 137 | $table = $db[$table]; |
| 139 | 138 | assert(isset($table)); |
@@ -265,8 +264,7 @@ discard block |
||
| 265 | 264 | public function group (string $column) { |
| 266 | 265 | if (!strlen($this->_group)) { |
| 267 | 266 | $this->_group = " GROUP BY {$column}"; |
| 268 | - } |
|
| 269 | - else { |
|
| 267 | + } else { |
|
| 270 | 268 | $this->_group .= ", {$column}"; |
| 271 | 269 | } |
| 272 | 270 | return $this; |
@@ -283,8 +281,7 @@ discard block |
||
| 283 | 281 | $conditions = implode(' AND ', $conditions); |
| 284 | 282 | if (!strlen($this->_having)) { |
| 285 | 283 | $this->_having = " HAVING {$conditions}"; |
| 286 | - } |
|
| 287 | - else { |
|
| 284 | + } else { |
|
| 288 | 285 | $this->_having .= " AND {$conditions}"; |
| 289 | 286 | } |
| 290 | 287 | return $this; |
@@ -376,8 +373,7 @@ discard block |
||
| 376 | 373 | public function limit (int $limit, int $offset = 0) { |
| 377 | 374 | if ($limit == 0) { |
| 378 | 375 | $this->_limit = ''; |
| 379 | - } |
|
| 380 | - else { |
|
| 376 | + } else { |
|
| 381 | 377 | $this->_limit = " LIMIT {$limit}"; |
| 382 | 378 | if ($offset > 1) { |
| 383 | 379 | $this->_limit .= " OFFSET {$offset}"; |
@@ -452,8 +448,7 @@ discard block |
||
| 452 | 448 | $name = $match['name'] ?? null; |
| 453 | 449 | if (is_int($alias)) { |
| 454 | 450 | $alias = $name; |
| 455 | - } |
|
| 456 | - elseif ($alias !== $name) { |
|
| 451 | + } elseif ($alias !== $name) { |
|
| 457 | 452 | $expr .= " AS {$alias}"; |
| 458 | 453 | } |
| 459 | 454 | if (isset($alias)) { |
@@ -539,8 +534,7 @@ discard block |
||
| 539 | 534 | $conditions = implode(' AND ', $conditions); |
| 540 | 535 | if (!strlen($this->_where)) { |
| 541 | 536 | $this->_where = " WHERE {$conditions}"; |
| 542 | - } |
|
| 543 | - else { |
|
| 537 | + } else { |
|
| 544 | 538 | $this->_where .= " AND {$conditions}"; |
| 545 | 539 | } |
| 546 | 540 | return $this; |
@@ -114,8 +114,7 @@ |
||
| 114 | 114 | $slots = implode(',', $this->db->slots(array_keys($this->columns))); |
| 115 | 115 | if ($this->db->isSQLite()) { |
| 116 | 116 | $sql = "INSERT OR IGNORE INTO {$this} ({$columns}) VALUES ({$slots})"; |
| 117 | - } |
|
| 118 | - else { |
|
| 117 | + } else { |
|
| 119 | 118 | $sql = "INSERT IGNORE INTO {$this} ({$columns}) VALUES ({$slots})"; |
| 120 | 119 | } |
| 121 | 120 | return $this->db->prepare($sql); |
@@ -301,13 +301,4 @@ |
||
| 301 | 301 | */ |
| 302 | 302 | public function down (\$schema) |
| 303 | 303 | { |
| 304 | - {$down} |
|
| 305 | - } |
|
| 306 | - |
|
| 307 | - }; |
|
| 308 | - |
|
| 309 | - MIGRATION |
|
| 310 | - ); |
|
| 311 | - } |
|
| 312 | - |
|
| 313 | -})->_exec(); |
|
| 304 | + {$down} |
|
| 314 | 305 | \ No newline at end of file |
@@ -301,13 +301,4 @@ |
||
| 301 | 301 | */ |
| 302 | 302 | public function down (\$schema) |
| 303 | 303 | { |
| 304 | - {$down} |
|
| 305 | - } |
|
| 306 | - |
|
| 307 | - }; |
|
| 308 | - |
|
| 309 | - MIGRATION |
|
| 310 | - ); |
|
| 311 | - } |
|
| 312 | - |
|
| 313 | -})->_exec(); |
|
| 304 | + {$down} |
|
| 314 | 305 | \ No newline at end of file |
@@ -356,8 +356,7 @@ |
||
| 356 | 356 | if ($this->db->isSQLite()) { |
| 357 | 357 | $info = $this->db->query("PRAGMA table_info({$name})")->fetchAll(); |
| 358 | 358 | $cols = array_column($info, 'name'); |
| 359 | - } |
|
| 360 | - else { |
|
| 359 | + } else { |
|
| 361 | 360 | $cols = $this->db->query("SELECT column_name FROM information_schema.tables WHERE table_name = \"{$name}\"")->fetchAll(DB::FETCH_COLUMN); |
| 362 | 361 | } |
| 363 | 362 | if (!$cols) { |
@@ -63,12 +63,10 @@ |
||
| 63 | 63 | if (isset($value)) { |
| 64 | 64 | assert(is_scalar($value)); |
| 65 | 65 | $this->attributes[$attr] = $value; |
| 66 | - } |
|
| 67 | - else { |
|
| 66 | + } else { |
|
| 68 | 67 | $this->offsetUnset($attr); |
| 69 | 68 | } |
| 70 | - } |
|
| 71 | - else { |
|
| 69 | + } else { |
|
| 72 | 70 | // appending must not be null. |
| 73 | 71 | // even though missing numeric offsets would yield null when fetched individually, |
| 74 | 72 | // getAttributes() would not have them. |
@@ -147,8 +147,7 @@ discard block |
||
| 147 | 147 | $doc = $rProp->getDocComment(); |
| 148 | 148 | if (preg_match(static::RX_IS_COLUMN, $doc)) { |
| 149 | 149 | $columns[] = $rProp->getName(); |
| 150 | - } |
|
| 151 | - elseif (preg_match(static::RX_EAV, $doc, $eav)) { |
|
| 150 | + } elseif (preg_match(static::RX_EAV, $doc, $eav)) { |
|
| 152 | 151 | preg_match(static::RX_EAV_VAR, $doc, $var); |
| 153 | 152 | $type = $var['type'] ?? 'string'; |
| 154 | 153 | $type = static::SCALARS[$type] ?? 'string'; |
@@ -513,8 +512,7 @@ discard block |
||
| 513 | 512 | public function save (EntityInterface $entity): int { |
| 514 | 513 | if (!$entity->getId()) { |
| 515 | 514 | $this->saveInsert($entity); |
| 516 | - } |
|
| 517 | - else { |
|
| 515 | + } else { |
|
| 518 | 516 | $this->saveUpdate($entity); |
| 519 | 517 | } |
| 520 | 518 | $this->saveEav($entity); |
@@ -637,8 +635,7 @@ discard block |
||
| 637 | 635 | foreach ($values as $name => $value) { |
| 638 | 636 | if (isset($this->properties[$name])) { |
| 639 | 637 | $this->properties[$name]->setValue($entity, $this->setType($name, $value)); |
| 640 | - } |
|
| 641 | - else { |
|
| 638 | + } else { |
|
| 642 | 639 | // attempt to set unknown fields directly on the instance. |
| 643 | 640 | $entity->{$name} = $value; |
| 644 | 641 | } |
@@ -166,8 +166,7 @@ discard block |
||
| 166 | 166 | |
| 167 | 167 | if ($this->isMySQL()) { |
| 168 | 168 | $this->exec("SET time_zone = 'UTC'"); |
| 169 | - } |
|
| 170 | - elseif ($this->isSQLite()) { |
|
| 169 | + } elseif ($this->isSQLite()) { |
|
| 171 | 170 | // polyfill sqlite functions |
| 172 | 171 | $this->sqliteCreateFunctions([ // deterministic functions |
| 173 | 172 | // https://www.sqlite.org/lang_mathfunc.html |
@@ -222,8 +221,7 @@ discard block |
||
| 222 | 221 | if ($this->transactions === 0) { |
| 223 | 222 | $this->logger->__invoke("BEGIN TRANSACTION"); |
| 224 | 223 | parent::beginTransaction(); |
| 225 | - } |
|
| 226 | - else { |
|
| 224 | + } else { |
|
| 227 | 225 | $this->exec("SAVEPOINT SAVEPOINT_{$this->transactions}"); |
| 228 | 226 | } |
| 229 | 227 | $this->transactions++; |
@@ -242,8 +240,7 @@ discard block |
||
| 242 | 240 | if ($this->transactions === 1) { |
| 243 | 241 | $this->logger->__invoke("COMMIT TRANSACTION"); |
| 244 | 242 | parent::commit(); |
| 245 | - } |
|
| 246 | - else { |
|
| 243 | + } else { |
|
| 247 | 244 | $savepoint = $this->transactions - 1; |
| 248 | 245 | $this->exec("RELEASE SAVEPOINT SAVEPOINT_{$savepoint}"); |
| 249 | 246 | } |
@@ -536,8 +533,7 @@ discard block |
||
| 536 | 533 | if ($this->transactions === 1) { |
| 537 | 534 | $this->logger->__invoke("ROLLBACK TRANSACTION"); |
| 538 | 535 | parent::rollBack(); |
| 539 | - } |
|
| 540 | - else { |
|
| 536 | + } else { |
|
| 541 | 537 | $savepoint = $this->transactions - 1; |
| 542 | 538 | $this->exec("ROLLBACK TO SAVEPOINT SAVEPOINT_{$savepoint}"); |
| 543 | 539 | } |