@@ -10,5 +10,5 @@ |
||
| 10 | 10 | /** |
| 11 | 11 | * @return int |
| 12 | 12 | */ |
| 13 | - public function getId (); |
|
| 13 | + public function getId(); |
|
| 14 | 14 | } |
| 15 | 15 | \ No newline at end of file |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | * |
| 22 | 22 | * @param DB $db |
| 23 | 23 | */ |
| 24 | - protected function __construct (DB $db) { |
|
| 24 | + protected function __construct(DB $db) { |
|
| 25 | 25 | $this->db = $db; |
| 26 | 26 | } |
| 27 | 27 | |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | * @param array $args |
| 32 | 32 | * @return $this |
| 33 | 33 | */ |
| 34 | - public function __invoke (array $args = null) { |
|
| 34 | + public function __invoke(array $args = null) { |
|
| 35 | 35 | $this->execute($args); |
| 36 | 36 | return $this; |
| 37 | 37 | } |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | * |
| 42 | 42 | * @return string |
| 43 | 43 | */ |
| 44 | - public function __toString () { |
|
| 44 | + public function __toString() { |
|
| 45 | 45 | return $this->queryString; |
| 46 | 46 | } |
| 47 | 47 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | * @return bool |
| 55 | 55 | * @throws ArgumentCountError |
| 56 | 56 | */ |
| 57 | - public function execute ($args = null) { |
|
| 57 | + public function execute($args = null) { |
|
| 58 | 58 | $this->db->getLogger()->__invoke($this->queryString); |
| 59 | 59 | if ($result = !parent::execute($args)) { |
| 60 | 60 | $info = $this->errorInfo(); |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | * |
| 72 | 72 | * @return int |
| 73 | 73 | */ |
| 74 | - public function getId (): int { |
|
| 74 | + public function getId(): int { |
|
| 75 | 75 | return (int)$this->db->lastInsertId(); |
| 76 | 76 | } |
| 77 | 77 | } |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | * @param string $name |
| 39 | 39 | * @param string $qualifier |
| 40 | 40 | */ |
| 41 | - public function __construct (DB $db, string $name, string $qualifier = '') { |
|
| 41 | + public function __construct(DB $db, string $name, string $qualifier = '') { |
|
| 42 | 42 | $this->db = $db; |
| 43 | 43 | $this->name = $name; |
| 44 | 44 | $this->qualifier = $qualifier; |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | * |
| 50 | 50 | * @return string |
| 51 | 51 | */ |
| 52 | - public function __toString (): string { |
|
| 52 | + public function __toString(): string { |
|
| 53 | 53 | if (strlen($this->qualifier)) { |
| 54 | 54 | return "{$this->qualifier}.{$this->name}"; |
| 55 | 55 | } |
@@ -59,14 +59,14 @@ discard block |
||
| 59 | 59 | /** |
| 60 | 60 | * @return string |
| 61 | 61 | */ |
| 62 | - final public function getName (): string { |
|
| 62 | + final public function getName(): string { |
|
| 63 | 63 | return $this->name; |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | /** |
| 67 | 67 | * @return string |
| 68 | 68 | */ |
| 69 | - final public function getQualifier (): string { |
|
| 69 | + final public function getQualifier(): string { |
|
| 70 | 70 | return $this->qualifier; |
| 71 | 71 | } |
| 72 | 72 | |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | * @param string $name |
| 75 | 75 | * @return $this |
| 76 | 76 | */ |
| 77 | - public function setName (string $name) { |
|
| 77 | + public function setName(string $name) { |
|
| 78 | 78 | $clone = clone $this; |
| 79 | 79 | $clone->name = $name; |
| 80 | 80 | return $clone; |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | * @param string $qualifier |
| 85 | 85 | * @return $this |
| 86 | 86 | */ |
| 87 | - public function setQualifier (string $qualifier) { |
|
| 87 | + public function setQualifier(string $qualifier) { |
|
| 88 | 88 | $clone = clone $this; |
| 89 | 89 | $clone->qualifier = $qualifier; |
| 90 | 90 | return $clone; |
@@ -31,8 +31,7 @@ |
||
| 31 | 31 | public static function fromInterface (DB $db, string $interface) { |
| 32 | 32 | try { |
| 33 | 33 | $ref = new ReflectionClass($interface); |
| 34 | - } |
|
| 35 | - catch (ReflectionException $exception) { |
|
| 34 | + } catch (ReflectionException $exception) { |
|
| 36 | 35 | throw new LogicException('Unexpected ReflectionException', 0, $exception); |
| 37 | 36 | } |
| 38 | 37 | $doc = $ref->getDocComment(); |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | * @param string $interface |
| 32 | 32 | * @return Junction |
| 33 | 33 | */ |
| 34 | - public static function fromInterface (DB $db, string $interface) { |
|
| 34 | + public static function fromInterface(DB $db, string $interface) { |
|
| 35 | 35 | try { |
| 36 | 36 | $ref = new ReflectionClass($interface); |
| 37 | 37 | } |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | * @param string $table |
| 55 | 55 | * @param string[] $classes |
| 56 | 56 | */ |
| 57 | - public function __construct (DB $db, string $table, array $classes) { |
|
| 57 | + public function __construct(DB $db, string $table, array $classes) { |
|
| 58 | 58 | parent::__construct($db, $table, array_keys($classes)); |
| 59 | 59 | $this->classes = $classes; |
| 60 | 60 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | * @param array $match Keyed by junction column. |
| 69 | 69 | * @return Select |
| 70 | 70 | */ |
| 71 | - public function getCollection (string $key, array $match = []) { |
|
| 71 | + public function getCollection(string $key, array $match = []) { |
|
| 72 | 72 | $record = $this->db->getRecord($this->classes[$key]); |
| 73 | 73 | $select = $record->select(); |
| 74 | 74 | $select->join($this, $this[$key]->isEqual($record['id'])); |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | * @param int[] $ids Keyed by column. |
| 85 | 85 | * @return int Rows affected. |
| 86 | 86 | */ |
| 87 | - public function link (array $ids): int { |
|
| 87 | + public function link(array $ids): int { |
|
| 88 | 88 | $statement = $this->cache(__FUNCTION__, function() { |
| 89 | 89 | $columns = implode(',', array_keys($this->columns)); |
| 90 | 90 | $slots = implode(',', SQL::slots(array_keys($this->columns))); |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | * @param array $ids Keyed by Column |
| 109 | 109 | * @return int Rows affected |
| 110 | 110 | */ |
| 111 | - public function unlink (array $ids): int { |
|
| 111 | + public function unlink(array $ids): int { |
|
| 112 | 112 | return $this->delete($ids); |
| 113 | 113 | } |
| 114 | 114 | } |
| 115 | 115 | \ No newline at end of file |
@@ -10,5 +10,5 @@ |
||
| 10 | 10 | /** |
| 11 | 11 | * @return string |
| 12 | 12 | */ |
| 13 | - public function __toString (); |
|
| 13 | + public function __toString(); |
|
| 14 | 14 | } |
| 15 | 15 | \ No newline at end of file |
@@ -157,8 +157,7 @@ discard block |
||
| 157 | 157 | if ($this->isSQLite()) { |
| 158 | 158 | $info = $this->query("PRAGMA table_info({$this->quote($name)})")->fetchAll(); |
| 159 | 159 | $cols = array_column($info, 'name'); |
| 160 | - } |
|
| 161 | - else { |
|
| 160 | + } else { |
|
| 162 | 161 | $cols = $this->query( |
| 163 | 162 | "SELECT column_name FROM information_schema.tables WHERE table_name = {$this->quote($name)}" |
| 164 | 163 | )->fetchAll(self::FETCH_COLUMN); |
@@ -240,11 +239,9 @@ discard block |
||
| 240 | 239 | public function offsetGet ($class) { |
| 241 | 240 | if (is_a($class, EntityInterface::class, true)) { |
| 242 | 241 | return $this->getRecord($class); |
| 243 | - } |
|
| 244 | - elseif (interface_exists($class)) { |
|
| 242 | + } elseif (interface_exists($class)) { |
|
| 245 | 243 | return $this->getJunction($class); |
| 246 | - } |
|
| 247 | - else { |
|
| 244 | + } else { |
|
| 248 | 245 | return $this->getTable($class); |
| 249 | 246 | } |
| 250 | 247 | } |
@@ -256,11 +253,9 @@ discard block |
||
| 256 | 253 | public function offsetSet ($class, $access) { |
| 257 | 254 | if ($access instanceof Record) { |
| 258 | 255 | $this->setRecord($class, $access); |
| 259 | - } |
|
| 260 | - elseif ($access instanceof Junction) { |
|
| 256 | + } elseif ($access instanceof Junction) { |
|
| 261 | 257 | $this->setJunction($class, $access); |
| 262 | - } |
|
| 263 | - else { |
|
| 258 | + } else { |
|
| 264 | 259 | throw new LogicException('Raw table access is immutable.'); |
| 265 | 260 | } |
| 266 | 261 | } |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | * @param string $password |
| 60 | 60 | * @param array $options |
| 61 | 61 | */ |
| 62 | - public function __construct ($dsn, $username = null, $password = null, $options = null) { |
|
| 62 | + public function __construct($dsn, $username = null, $password = null, $options = null) { |
|
| 63 | 63 | parent::__construct($dsn, $username, $password, $options); |
| 64 | 64 | $this->driver = $this->getAttribute(self::ATTR_DRIVER_NAME); |
| 65 | 65 | $this->setAttribute(self::ATTR_DEFAULT_FETCH_MODE, self::FETCH_ASSOC); |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | * |
| 82 | 82 | * @return string |
| 83 | 83 | */ |
| 84 | - final public function __toString () { |
|
| 84 | + final public function __toString() { |
|
| 85 | 85 | return $this->driver; |
| 86 | 86 | } |
| 87 | 87 | |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | * @param string $sql |
| 92 | 92 | * @return int |
| 93 | 93 | */ |
| 94 | - public function exec ($sql): int { |
|
| 94 | + public function exec($sql): int { |
|
| 95 | 95 | $this->logger->__invoke($sql); |
| 96 | 96 | return parent::exec($sql); |
| 97 | 97 | } |
@@ -107,14 +107,14 @@ discard block |
||
| 107 | 107 | * @param mixed ...$args |
| 108 | 108 | * @return mixed |
| 109 | 109 | */ |
| 110 | - public function factory (string $class, ...$args) { |
|
| 110 | + public function factory(string $class, ...$args) { |
|
| 111 | 111 | return new $class($this, ...$args); |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | /** |
| 115 | 115 | * @return string |
| 116 | 116 | */ |
| 117 | - final public function getDriver (): string { |
|
| 117 | + final public function getDriver(): string { |
|
| 118 | 118 | return $this->driver; |
| 119 | 119 | } |
| 120 | 120 | |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | * @param string $interface |
| 125 | 125 | * @return Junction |
| 126 | 126 | */ |
| 127 | - public function getJunction ($interface) { |
|
| 127 | + public function getJunction($interface) { |
|
| 128 | 128 | return $this->junctions[$interface] |
| 129 | 129 | ?? $this->junctions[$interface] = Junction::fromInterface($this, $interface); |
| 130 | 130 | } |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | /** |
| 133 | 133 | * @return Closure |
| 134 | 134 | */ |
| 135 | - public function getLogger () { |
|
| 135 | + public function getLogger() { |
|
| 136 | 136 | return $this->logger; |
| 137 | 137 | } |
| 138 | 138 | |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | * @param string|EntityInterface $class |
| 143 | 143 | * @return Record |
| 144 | 144 | */ |
| 145 | - public function getRecord ($class) { |
|
| 145 | + public function getRecord($class) { |
|
| 146 | 146 | if (is_object($class)) { |
| 147 | 147 | $class = get_class($class); |
| 148 | 148 | } |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | * @param string $name |
| 155 | 155 | * @return null|Table |
| 156 | 156 | */ |
| 157 | - public function getTable (string $name) { |
|
| 157 | + public function getTable(string $name) { |
|
| 158 | 158 | if (!isset($this->tables[$name])) { |
| 159 | 159 | if ($this->isSQLite()) { |
| 160 | 160 | $info = $this->query("PRAGMA table_info({$this->quote($name)})")->fetchAll(); |
@@ -176,21 +176,21 @@ discard block |
||
| 176 | 176 | /** |
| 177 | 177 | * @return bool |
| 178 | 178 | */ |
| 179 | - final public function isMySQL (): bool { |
|
| 179 | + final public function isMySQL(): bool { |
|
| 180 | 180 | return $this->driver === 'mysql'; |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | /** |
| 184 | 184 | * @return bool |
| 185 | 185 | */ |
| 186 | - final public function isPostgreSQL (): bool { |
|
| 186 | + final public function isPostgreSQL(): bool { |
|
| 187 | 187 | return $this->driver === 'pgsql'; |
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | /** |
| 191 | 191 | * @return bool |
| 192 | 192 | */ |
| 193 | - final public function isSQLite (): bool { |
|
| 193 | + final public function isSQLite(): bool { |
|
| 194 | 194 | return $this->driver === 'sqlite'; |
| 195 | 195 | } |
| 196 | 196 | |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | * @param mixed $b |
| 212 | 212 | * @return Predicate |
| 213 | 213 | */ |
| 214 | - public function match ($a, $b) { |
|
| 214 | + public function match($a, $b) { |
|
| 215 | 215 | if ($b instanceof Closure) { |
| 216 | 216 | return $b->__invoke($a, $this); |
| 217 | 217 | } |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | * @param string $class Class or interface name. |
| 232 | 232 | * @return bool |
| 233 | 233 | */ |
| 234 | - public function offsetExists ($class): bool { |
|
| 234 | + public function offsetExists($class): bool { |
|
| 235 | 235 | return (bool)$this->offsetGet($class); |
| 236 | 236 | } |
| 237 | 237 | |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | * @param string $class Class or interface name. |
| 240 | 240 | * @return null|Table|Record|Junction |
| 241 | 241 | */ |
| 242 | - public function offsetGet ($class) { |
|
| 242 | + public function offsetGet($class) { |
|
| 243 | 243 | if (is_a($class, EntityInterface::class, true)) { |
| 244 | 244 | return $this->getRecord($class); |
| 245 | 245 | } |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | * @param mixed $class Class or interface name. |
| 256 | 256 | * @param Table|Record|Junction $access |
| 257 | 257 | */ |
| 258 | - public function offsetSet ($class, $access) { |
|
| 258 | + public function offsetSet($class, $access) { |
|
| 259 | 259 | if ($access instanceof Record) { |
| 260 | 260 | $this->setRecord($class, $access); |
| 261 | 261 | } |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | /** |
| 271 | 271 | * @param string $class Class or interface name. |
| 272 | 272 | */ |
| 273 | - public function offsetUnset ($class) { |
|
| 273 | + public function offsetUnset($class) { |
|
| 274 | 274 | unset($this->records[$class]); |
| 275 | 275 | unset($this->junctions[$class]); |
| 276 | 276 | } |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | * @param array $options |
| 283 | 283 | * @return Statement |
| 284 | 284 | */ |
| 285 | - public function prepare ($sql, $options = []) { |
|
| 285 | + public function prepare($sql, $options = []) { |
|
| 286 | 286 | $this->logger->__invoke($sql); |
| 287 | 287 | /** @var Statement $statement */ |
| 288 | 288 | $statement = parent::prepare($sql, $options); |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | * @param array $ctorargs Optional. |
| 299 | 299 | * @return Statement |
| 300 | 300 | */ |
| 301 | - public function query ($sql, $mode = PDO::ATTR_DEFAULT_FETCH_MODE, $arg3 = null, array $ctorargs = []) { |
|
| 301 | + public function query($sql, $mode = PDO::ATTR_DEFAULT_FETCH_MODE, $arg3 = null, array $ctorargs = []) { |
|
| 302 | 302 | $this->logger->__invoke($sql); |
| 303 | 303 | /** @var Statement $statement */ |
| 304 | 304 | $statement = parent::query(...func_get_args()); |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | * @param int $type Ignored. |
| 317 | 317 | * @return string|ExpressionInterface |
| 318 | 318 | */ |
| 319 | - public function quote ($value, $type = self::PARAM_STR) { |
|
| 319 | + public function quote($value, $type = self::PARAM_STR) { |
|
| 320 | 320 | if ($value instanceof ExpressionInterface) { |
| 321 | 321 | return $value; |
| 322 | 322 | } |
@@ -336,7 +336,7 @@ discard block |
||
| 336 | 336 | * @param array $values |
| 337 | 337 | * @return string[] |
| 338 | 338 | */ |
| 339 | - public function quoteArray (array $values) { |
|
| 339 | + public function quoteArray(array $values) { |
|
| 340 | 340 | return array_map([$this, 'quote'], $values); |
| 341 | 341 | } |
| 342 | 342 | |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | * @param array $values |
| 347 | 347 | * @return string |
| 348 | 348 | */ |
| 349 | - public function quoteList (array $values): string { |
|
| 349 | + public function quoteList(array $values): string { |
|
| 350 | 350 | return implode(',', $this->quoteArray($values)); |
| 351 | 351 | } |
| 352 | 352 | |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | * @param EntityInterface $entity |
| 357 | 357 | * @return int ID |
| 358 | 358 | */ |
| 359 | - public function save (EntityInterface $entity): int { |
|
| 359 | + public function save(EntityInterface $entity): int { |
|
| 360 | 360 | return $this->getRecord($entity)->save($entity); |
| 361 | 361 | } |
| 362 | 362 | |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | * @param Junction $junction |
| 366 | 366 | * @return $this |
| 367 | 367 | */ |
| 368 | - public function setJunction (string $interface, Junction $junction) { |
|
| 368 | + public function setJunction(string $interface, Junction $junction) { |
|
| 369 | 369 | $this->junctions[$interface] = $junction; |
| 370 | 370 | return $this; |
| 371 | 371 | } |
@@ -374,7 +374,7 @@ discard block |
||
| 374 | 374 | * @param Closure $logger |
| 375 | 375 | * @return $this |
| 376 | 376 | */ |
| 377 | - public function setLogger (Closure $logger) { |
|
| 377 | + public function setLogger(Closure $logger) { |
|
| 378 | 378 | $this->logger = $logger; |
| 379 | 379 | return $this; |
| 380 | 380 | } |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | * @param Record $record |
| 385 | 385 | * @return $this |
| 386 | 386 | */ |
| 387 | - public function setRecord (string $class, Record $record) { |
|
| 387 | + public function setRecord(string $class, Record $record) { |
|
| 388 | 388 | $this->records[$class] = $record; |
| 389 | 389 | return $this; |
| 390 | 390 | } |
@@ -117,8 +117,7 @@ discard block |
||
| 117 | 117 | if ($table instanceof Select) { |
| 118 | 118 | $this->table = $table->toSubquery(); |
| 119 | 119 | $this->alias = uniqid('_') . "_{$table->alias}"; |
| 120 | - } |
|
| 121 | - else { |
|
| 120 | + } else { |
|
| 122 | 121 | $this->table = (string)$table; |
| 123 | 122 | $this->alias = uniqid('_') . "__{$table}"; |
| 124 | 123 | } |
@@ -228,8 +227,7 @@ discard block |
||
| 228 | 227 | public function group (string $column) { |
| 229 | 228 | if (!strlen($this->_group)) { |
| 230 | 229 | $this->_group = " GROUP BY {$column}"; |
| 231 | - } |
|
| 232 | - else { |
|
| 230 | + } else { |
|
| 233 | 231 | $this->_group .= ", {$column}"; |
| 234 | 232 | } |
| 235 | 233 | return $this; |
@@ -244,8 +242,7 @@ discard block |
||
| 244 | 242 | public function having (string $condition) { |
| 245 | 243 | if (!strlen($this->_having)) { |
| 246 | 244 | $this->_having = " HAVING {$condition}"; |
| 247 | - } |
|
| 248 | - else { |
|
| 245 | + } else { |
|
| 249 | 246 | $this->_having .= " AND {$condition}"; |
| 250 | 247 | } |
| 251 | 248 | return $this; |
@@ -264,8 +261,7 @@ discard block |
||
| 264 | 261 | $select->_limit = ''; |
| 265 | 262 | if ($all) { |
| 266 | 263 | $this->_import .= " INTERSECT ALL {$select->toSql()}"; |
| 267 | - } |
|
| 268 | - else { |
|
| 264 | + } else { |
|
| 269 | 265 | $this->_import .= " INTERSECT {$select->toSql()}"; |
| 270 | 266 | } |
| 271 | 267 | return $this; |
@@ -315,8 +311,7 @@ discard block |
||
| 315 | 311 | public function limit (int $limit, int $offset = 0) { |
| 316 | 312 | if ($limit == 0) { |
| 317 | 313 | $this->_limit = ''; |
| 318 | - } |
|
| 319 | - else { |
|
| 314 | + } else { |
|
| 320 | 315 | $this->_limit = " LIMIT {$limit}"; |
| 321 | 316 | if ($offset > 1) { |
| 322 | 317 | $this->_limit .= " OFFSET {$offset}"; |
@@ -389,8 +384,7 @@ discard block |
||
| 389 | 384 | $name = $match['name'] ?? null; |
| 390 | 385 | if (is_int($alias)) { |
| 391 | 386 | $alias = $name; |
| 392 | - } |
|
| 393 | - elseif ($alias !== $name) { |
|
| 387 | + } elseif ($alias !== $name) { |
|
| 394 | 388 | $expr .= " AS {$alias}"; |
| 395 | 389 | } |
| 396 | 390 | if (isset($alias)) { |
@@ -450,8 +444,7 @@ discard block |
||
| 450 | 444 | $select->_limit = ''; |
| 451 | 445 | if ($all) { |
| 452 | 446 | $this->_import .= " UNION ALL {$select->toSql()}"; |
| 453 | - } |
|
| 454 | - else { |
|
| 447 | + } else { |
|
| 455 | 448 | $this->_import .= " UNION {$select->toSql()}"; |
| 456 | 449 | } |
| 457 | 450 | return $this; |
@@ -466,8 +459,7 @@ discard block |
||
| 466 | 459 | public function where (string $condition) { |
| 467 | 460 | if (!strlen($this->_where)) { |
| 468 | 461 | $this->_where = " WHERE {$condition}"; |
| 469 | - } |
|
| 470 | - else { |
|
| 462 | + } else { |
|
| 471 | 463 | $this->_where .= " AND {$condition}"; |
| 472 | 464 | } |
| 473 | 465 | return $this; |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | * @param string|Select $table |
| 117 | 117 | * @param string[] $columns |
| 118 | 118 | */ |
| 119 | - public function __construct (DB $db, $table, array $columns) { |
|
| 119 | + public function __construct(DB $db, $table, array $columns) { |
|
| 120 | 120 | parent::__construct($db); |
| 121 | 121 | if ($table instanceof Select) { |
| 122 | 122 | $this->table = $table->toSubquery(); |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | * @param array $args |
| 137 | 137 | * @return Statement |
| 138 | 138 | */ |
| 139 | - public function __invoke (array $args = []) { |
|
| 139 | + public function __invoke(array $args = []) { |
|
| 140 | 140 | return $this->execute($args); |
| 141 | 141 | } |
| 142 | 142 | |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | * |
| 146 | 146 | * @return string |
| 147 | 147 | */ |
| 148 | - final public function __toString () { |
|
| 148 | + final public function __toString() { |
|
| 149 | 149 | return $this->alias; |
| 150 | 150 | } |
| 151 | 151 | |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | * @param array $args Execution arguments. |
| 156 | 156 | * @return int |
| 157 | 157 | */ |
| 158 | - public function count (array $args = []): int { |
|
| 158 | + public function count(array $args = []): int { |
|
| 159 | 159 | $clone = clone $this; |
| 160 | 160 | $clone->_columns = 'COUNT(*)'; |
| 161 | 161 | $clone->_order = ''; |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | * @param array $args |
| 169 | 169 | * @return Statement |
| 170 | 170 | */ |
| 171 | - public function execute (array $args = []) { |
|
| 171 | + public function execute(array $args = []) { |
|
| 172 | 172 | if (empty($args)) { |
| 173 | 173 | return $this->db->query($this->toSql()); |
| 174 | 174 | } |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | * @param array $args Execution arguments. |
| 184 | 184 | * @return array |
| 185 | 185 | */ |
| 186 | - public function getAll (array $args = []): array { |
|
| 186 | + public function getAll(array $args = []): array { |
|
| 187 | 187 | return iterator_to_array($this->fetcher->__invoke($this->execute($args))); |
| 188 | 188 | } |
| 189 | 189 | |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | * @param array $args Execution arguments. |
| 197 | 197 | * @return Generator |
| 198 | 198 | */ |
| 199 | - public function getEach (array $args = []) { |
|
| 199 | + public function getEach(array $args = []) { |
|
| 200 | 200 | yield from $this->fetcher->__invoke($this->execute($args)); |
| 201 | 201 | } |
| 202 | 202 | |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | * @param array $args |
| 209 | 209 | * @return mixed |
| 210 | 210 | */ |
| 211 | - public function getFirst (array $args = []) { |
|
| 211 | + public function getFirst(array $args = []) { |
|
| 212 | 212 | return $this->getEach($args)->current(); |
| 213 | 213 | } |
| 214 | 214 | |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | * |
| 220 | 220 | * @return Generator |
| 221 | 221 | */ |
| 222 | - public function getIterator () { |
|
| 222 | + public function getIterator() { |
|
| 223 | 223 | yield from $this->getEach(); |
| 224 | 224 | } |
| 225 | 225 | |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | * @param string $column |
| 230 | 230 | * @return $this |
| 231 | 231 | */ |
| 232 | - public function group (string $column) { |
|
| 232 | + public function group(string $column) { |
|
| 233 | 233 | if (!strlen($this->_group)) { |
| 234 | 234 | $this->_group = " GROUP BY {$column}"; |
| 235 | 235 | } |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | * @param string $condition |
| 246 | 246 | * @return $this |
| 247 | 247 | */ |
| 248 | - public function having (string $condition) { |
|
| 248 | + public function having(string $condition) { |
|
| 249 | 249 | if (!strlen($this->_having)) { |
| 250 | 250 | $this->_having = " HAVING {$condition}"; |
| 251 | 251 | } |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | * @param bool $all |
| 263 | 263 | * @return $this |
| 264 | 264 | */ |
| 265 | - public function intersect (Select $select, $all = false) { |
|
| 265 | + public function intersect(Select $select, $all = false) { |
|
| 266 | 266 | $select = clone $select; |
| 267 | 267 | $select->_order = ''; |
| 268 | 268 | $select->_limit = ''; |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | * |
| 281 | 281 | * @return Predicate |
| 282 | 282 | */ |
| 283 | - public function isEmpty () { |
|
| 283 | + public function isEmpty() { |
|
| 284 | 284 | return Predicate::factory($this->db, "NOT EXISTS ({$this->toSql()})"); |
| 285 | 285 | } |
| 286 | 286 | |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | * |
| 290 | 290 | * @return Predicate |
| 291 | 291 | */ |
| 292 | - public function isNotEmpty () { |
|
| 292 | + public function isNotEmpty() { |
|
| 293 | 293 | return Predicate::factory($this->db, "EXISTS ({$this->toSql()})"); |
| 294 | 294 | } |
| 295 | 295 | |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | * @param string $type |
| 302 | 302 | * @return $this |
| 303 | 303 | */ |
| 304 | - public function join ($table, string $condition, string $type = 'INNER') { |
|
| 304 | + public function join($table, string $condition, string $type = 'INNER') { |
|
| 305 | 305 | if ($table instanceof Select) { |
| 306 | 306 | $table = $table->toSubquery(); |
| 307 | 307 | } |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | * @param int $offset |
| 317 | 317 | * @return $this |
| 318 | 318 | */ |
| 319 | - public function limit (int $limit, int $offset = 0) { |
|
| 319 | + public function limit(int $limit, int $offset = 0) { |
|
| 320 | 320 | if ($limit == 0) { |
| 321 | 321 | $this->_limit = ''; |
| 322 | 322 | } |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | * @param int|string $ref Ordinal or reference name. |
| 336 | 336 | * @return null|Column |
| 337 | 337 | */ |
| 338 | - public function offsetGet ($ref) { |
|
| 338 | + public function offsetGet($ref) { |
|
| 339 | 339 | if (is_int($ref)) { |
| 340 | 340 | return current(array_slice($this->refs, $ref, 1)) ?: null; |
| 341 | 341 | } |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | * @param string $order |
| 349 | 349 | * @return $this |
| 350 | 350 | */ |
| 351 | - public function order (string $order) { |
|
| 351 | + public function order(string $order) { |
|
| 352 | 352 | if (strlen($order)) { |
| 353 | 353 | $order = " ORDER BY {$order}"; |
| 354 | 354 | } |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | /** |
| 360 | 360 | * @return Statement |
| 361 | 361 | */ |
| 362 | - public function prepare () { |
|
| 362 | + public function prepare() { |
|
| 363 | 363 | return $this->db->prepare($this->toSql()); |
| 364 | 364 | } |
| 365 | 365 | |
@@ -367,7 +367,7 @@ discard block |
||
| 367 | 367 | * @param string $alias |
| 368 | 368 | * @return $this |
| 369 | 369 | */ |
| 370 | - public function setAlias (string $alias) { |
|
| 370 | + public function setAlias(string $alias) { |
|
| 371 | 371 | $this->alias = $alias; |
| 372 | 372 | foreach ($this->refs as $k => $column) { |
| 373 | 373 | $this->refs[$k] = $column->setQualifier($alias); |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | * @param string[] $expressions Keyed by alias if applicable. |
| 386 | 386 | * @return $this |
| 387 | 387 | */ |
| 388 | - public function setColumns (array $expressions) { |
|
| 388 | + public function setColumns(array $expressions) { |
|
| 389 | 389 | $this->refs = []; |
| 390 | 390 | $_columns = []; |
| 391 | 391 | foreach ($expressions as $alias => $expr) { |
@@ -410,7 +410,7 @@ discard block |
||
| 410 | 410 | * @param Closure $fetcher |
| 411 | 411 | * @return $this |
| 412 | 412 | */ |
| 413 | - public function setFetcher (Closure $fetcher) { |
|
| 413 | + public function setFetcher(Closure $fetcher) { |
|
| 414 | 414 | $this->fetcher = $fetcher; |
| 415 | 415 | return $this; |
| 416 | 416 | } |
@@ -420,7 +420,7 @@ discard block |
||
| 420 | 420 | * |
| 421 | 421 | * @return string |
| 422 | 422 | */ |
| 423 | - public function toSql (): string { |
|
| 423 | + public function toSql(): string { |
|
| 424 | 424 | $sql = "SELECT {$this->_columns} FROM {$this->table}"; |
| 425 | 425 | $sql .= $this->_join; |
| 426 | 426 | $sql .= $this->_where; |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | * |
| 438 | 438 | * @return string |
| 439 | 439 | */ |
| 440 | - public function toSubquery (): string { |
|
| 440 | + public function toSubquery(): string { |
|
| 441 | 441 | return "({$this->toSql()}) AS {$this->alias}"; |
| 442 | 442 | } |
| 443 | 443 | |
@@ -448,7 +448,7 @@ discard block |
||
| 448 | 448 | * @param bool $all |
| 449 | 449 | * @return $this |
| 450 | 450 | */ |
| 451 | - public function union (Select $select, $all = false) { |
|
| 451 | + public function union(Select $select, $all = false) { |
|
| 452 | 452 | $select = clone $select; |
| 453 | 453 | $select->_order = ''; |
| 454 | 454 | $select->_limit = ''; |
@@ -467,7 +467,7 @@ discard block |
||
| 467 | 467 | * @param string $condition |
| 468 | 468 | * @return $this |
| 469 | 469 | */ |
| 470 | - public function where (string $condition) { |
|
| 470 | + public function where(string $condition) { |
|
| 471 | 471 | if (!strlen($this->_where)) { |
| 472 | 472 | $this->_where = " WHERE {$condition}"; |
| 473 | 473 | } |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | /** |
| 31 | 31 | * @return array |
| 32 | 32 | */ |
| 33 | - public function getAttributes (): array { |
|
| 33 | + public function getAttributes(): array { |
|
| 34 | 34 | return $this->attributes ?? []; |
| 35 | 35 | } |
| 36 | 36 | |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | * @param mixed $attr |
| 39 | 39 | * @return bool |
| 40 | 40 | */ |
| 41 | - public function offsetExists ($attr): bool { |
|
| 41 | + public function offsetExists($attr): bool { |
|
| 42 | 42 | return isset($this->attributes) and array_key_exists($attr, $this->attributes); |
| 43 | 43 | } |
| 44 | 44 | |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | * @param mixed $attr |
| 47 | 47 | * @return null|mixed |
| 48 | 48 | */ |
| 49 | - public function offsetGet ($attr) { |
|
| 49 | + public function offsetGet($attr) { |
|
| 50 | 50 | return $this->attributes[$attr] ?? null; |
| 51 | 51 | } |
| 52 | 52 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | * @param mixed $attr |
| 55 | 55 | * @param mixed $value |
| 56 | 56 | */ |
| 57 | - public function offsetSet ($attr, $value): void { |
|
| 57 | + public function offsetSet($attr, $value): void { |
|
| 58 | 58 | if (isset($attr)) { |
| 59 | 59 | $this->attributes[$attr] = $value; |
| 60 | 60 | } |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | /** |
| 67 | 67 | * @param mixed $attr |
| 68 | 68 | */ |
| 69 | - public function offsetUnset ($attr): void { |
|
| 69 | + public function offsetUnset($attr): void { |
|
| 70 | 70 | unset($this->attributes[$attr]); |
| 71 | 71 | } |
| 72 | 72 | |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | * @param array $attributes |
| 75 | 75 | * @return $this |
| 76 | 76 | */ |
| 77 | - public function setAttributes (array $attributes) { |
|
| 77 | + public function setAttributes(array $attributes) { |
|
| 78 | 78 | $this->attributes = $attributes; |
| 79 | 79 | return $this; |
| 80 | 80 | } |
@@ -57,8 +57,7 @@ |
||
| 57 | 57 | public function offsetSet ($attr, $value): void { |
| 58 | 58 | if (isset($attr)) { |
| 59 | 59 | $this->attributes[$attr] = $value; |
| 60 | - } |
|
| 61 | - else { |
|
| 60 | + } else { |
|
| 62 | 61 | $this->attributes[] = $value; |
| 63 | 62 | } |
| 64 | 63 | } |
@@ -16,13 +16,13 @@ discard block |
||
| 16 | 16 | * |
| 17 | 17 | * @return string |
| 18 | 18 | */ |
| 19 | - abstract public function __toString (); |
|
| 19 | + abstract public function __toString(); |
|
| 20 | 20 | |
| 21 | 21 | /** |
| 22 | 22 | * @param int|string $column |
| 23 | 23 | * @return null|Column |
| 24 | 24 | */ |
| 25 | - abstract public function offsetGet ($column); |
|
| 25 | + abstract public function offsetGet($column); |
|
| 26 | 26 | |
| 27 | 27 | /** |
| 28 | 28 | * @var DB |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | /** |
| 33 | 33 | * @param DB $db |
| 34 | 34 | */ |
| 35 | - public function __construct (DB $db) { |
|
| 35 | + public function __construct(DB $db) { |
|
| 36 | 36 | $this->db = $db; |
| 37 | 37 | } |
| 38 | 38 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | * @param int|string $column |
| 41 | 41 | * @return bool |
| 42 | 42 | */ |
| 43 | - public function offsetExists ($column): bool { |
|
| 43 | + public function offsetExists($column): bool { |
|
| 44 | 44 | return $this->offsetGet($column) !== null; |
| 45 | 45 | } |
| 46 | 46 | |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | * @param void $value |
| 52 | 52 | * @throws Exception |
| 53 | 53 | */ |
| 54 | - final public function offsetSet ($offset, $value): void { |
|
| 54 | + final public function offsetSet($offset, $value): void { |
|
| 55 | 55 | throw new Exception('Tables are immutable.'); |
| 56 | 56 | } |
| 57 | 57 | |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | * @param void $name |
| 62 | 62 | * @throws Exception |
| 63 | 63 | */ |
| 64 | - final public function offsetUnset ($name): void { |
|
| 64 | + final public function offsetUnset($name): void { |
|
| 65 | 65 | $this->offsetSet($name, null); |
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | \ No newline at end of file |