hfw / db

src/DB/EntityInterface.php

Spacing +1 added lines, -1 removed lines

@@ -10,5 +10,5 @@
     /**
      * @return int
      */
-    public function getId ();
+    public function getId();
 }
\ No newline at end of file

src/DB/Statement.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
      *
      * @param DB $db
      */
-    protected function __construct (DB $db) {
+    protected function __construct(DB $db) {
         $this->db = $db;
     }
 
@@ -31,7 +31,7 @@ 
      * @param array $args
      * @return $this
      */
-    public function __invoke (array $args = null) {
+    public function __invoke(array $args = null) {
         $this->execute($args);
         return $this;
     }
@@ -41,7 +41,7 @@ 
      *
      * @return string
      */
-    public function __toString () {
+    public function __toString() {
         return $this->queryString;
     }
 
@@ -54,7 +54,7 @@ 
      * @return bool
      * @throws ArgumentCountError
      */
-    public function execute ($args = null) {
+    public function execute($args = null) {
         $this->db->getLogger()->__invoke($this->queryString);
         if ($result = !parent::execute($args)) {
             $info = $this->errorInfo();
@@ -71,7 +71,7 @@ 
      *
      * @return int
      */
-    public function getId (): int {
+    public function getId(): int {
         return (int)$this->db->lastInsertId();
     }
 }

src/DB/Junction.php

Braces +1 added lines, -2 removed lines

@@ -31,8 +31,7 @@
     public static function fromInterface (DB $db, string $interface) {
         try {
             $ref = new ReflectionClass($interface);
-        }
-        catch (ReflectionException $exception) {
+        } catch (ReflectionException $exception) {
             throw new LogicException('Unexpected ReflectionException', 0, $exception);
         }
         $doc = $ref->getDocComment();

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
      * @param string $interface
      * @return Junction
      */
-    public static function fromInterface (DB $db, string $interface) {
+    public static function fromInterface(DB $db, string $interface) {
         try {
             $ref = new ReflectionClass($interface);
         }
@@ -54,7 +54,7 @@ 
      * @param string $table
      * @param string[] $classes
      */
-    public function __construct (DB $db, string $table, array $classes) {
+    public function __construct(DB $db, string $table, array $classes) {
         parent::__construct($db, $table, array_keys($classes));
         $this->classes = $classes;
     }
@@ -68,7 +68,7 @@ 
      * @param array $match Keyed by junction column.
      * @return Select|EntityInterface[]
      */
-    public function find (string $key, array $match = []) {
+    public function find(string $key, array $match = []) {
         $record = $this->db->getRecord($this->classes[$key]);
         $select = $record->loadAll();
         $select->join($this, $this[$key]->isEqual($record['id']));
@@ -84,7 +84,7 @@ 
      * @param int[] $ids Keyed by column.
      * @return int Rows affected.
      */
-    public function link (array $ids): int {
+    public function link(array $ids): int {
         $statement = $this->cache(__FUNCTION__, function() {
             $columns = implode(',', array_keys($this->columns));
             $slots = implode(',', SQL::slots(array_keys($this->columns)));
@@ -108,7 +108,7 @@ 
      * @param array $ids Keyed by Column
      * @return int Rows affected
      */
-    public function unlink (array $ids): int {
+    public function unlink(array $ids): int {
         return $this->delete($ids);
     }
 }
\ No newline at end of file

src/DB/SQL/ExpressionInterface.php

Spacing +1 added lines, -1 removed lines

@@ -10,5 +10,5 @@
     /**
      * @return string
      */
-    public function __toString ();
+    public function __toString();
 }
\ No newline at end of file

src/DB/Select.php

Braces +8 added lines, -16 removed lines

@@ -117,8 +117,7 @@ 
         if ($table instanceof Select) {
             $this->table = $table->toSubquery();
             $this->alias = uniqid('_') . "_{$table->alias}";
-        }
-        else {
+        } else {
             $this->table = (string)$table;
             $this->alias = uniqid('_') . "__{$table}";
         }
@@ -228,8 +227,7 @@ 
     public function group (string $column) {
         if (!strlen($this->_group)) {
             $this->_group = " GROUP BY {$column}";
-        }
-        else {
+        } else {
             $this->_group .= ", {$column}";
         }
         return $this;
@@ -244,8 +242,7 @@ 
     public function having (string $condition) {
         if (!strlen($this->_having)) {
             $this->_having = " HAVING {$condition}";
-        }
-        else {
+        } else {
             $this->_having .= " AND {$condition}";
         }
         return $this;
@@ -264,8 +261,7 @@ 
         $select->_limit = '';
         if ($all) {
             $this->_import .= " INTERSECT ALL {$select->toSql()}";
-        }
-        else {
+        } else {
             $this->_import .= " INTERSECT {$select->toSql()}";
         }
         return $this;
@@ -315,8 +311,7 @@ 
     public function limit (int $limit, int $offset = 0) {
         if ($limit == 0) {
             $this->_limit = '';
-        }
-        else {
+        } else {
             $this->_limit = " LIMIT {$limit}";
             if ($offset > 1) {
                 $this->_limit .= " OFFSET {$offset}";
@@ -389,8 +384,7 @@ 
             $name = $match['name'] ?? null;
             if (is_int($alias)) {
                 $alias = $name;
-            }
-            elseif ($alias !== $name) {
+            } elseif ($alias !== $name) {
                 $expr .= " AS {$alias}";
             }
             if (isset($alias)) {
@@ -450,8 +444,7 @@ 
         $select->_limit = '';
         if ($all) {
             $this->_import .= " UNION ALL {$select->toSql()}";
-        }
-        else {
+        } else {
             $this->_import .= " UNION {$select->toSql()}";
         }
         return $this;
@@ -466,8 +459,7 @@ 
     public function where (string $condition) {
         if (!strlen($this->_where)) {
             $this->_where = " WHERE {$condition}";
-        }
-        else {
+        } else {
             $this->_where .= " AND {$condition}";
         }
         return $this;

Spacing +26 added lines, -26 removed lines

@@ -116,7 +116,7 @@ 
      * @param string|Select $table
      * @param string[] $columns
      */
-    public function __construct (DB $db, $table, array $columns) {
+    public function __construct(DB $db, $table, array $columns) {
         parent::__construct($db);
         if ($table instanceof Select) {
             $this->table = $table->toSubquery();
@@ -136,7 +136,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function __invoke (array $args = []) {
+    public function __invoke(array $args = []) {
         return $this->execute($args);
     }
 
@@ -145,7 +145,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->alias;
     }
 
@@ -155,7 +155,7 @@ 
      * @param array $args Execution arguments.
      * @return int
      */
-    public function count (array $args = []): int {
+    public function count(array $args = []): int {
         $clone = clone $this;
         $clone->_columns = 'COUNT(*)';
         $clone->_order = '';
@@ -168,7 +168,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function execute (array $args = []) {
+    public function execute(array $args = []) {
         if (empty($args)) {
             return $this->db->query($this->toSql());
         }
@@ -183,7 +183,7 @@ 
      * @param array $args Execution arguments.
      * @return array
      */
-    public function getAll (array $args = []): array {
+    public function getAll(array $args = []): array {
         return iterator_to_array($this->fetcher->__invoke($this->execute($args)));
     }
 
@@ -196,7 +196,7 @@ 
      * @param array $args Execution arguments.
      * @return Generator
      */
-    public function getEach (array $args = []) {
+    public function getEach(array $args = []) {
         yield from $this->fetcher->__invoke($this->execute($args));
     }
 
@@ -208,7 +208,7 @@ 
      * @param array $args
      * @return mixed
      */
-    public function getFirst (array $args = []) {
+    public function getFirst(array $args = []) {
         return $this->getEach($args)->current();
     }
 
@@ -219,7 +219,7 @@ 
      *
      * @return Generator
      */
-    public function getIterator () {
+    public function getIterator() {
         yield from $this->getEach();
     }
 
@@ -229,7 +229,7 @@ 
      * @param string $column
      * @return $this
      */
-    public function group (string $column) {
+    public function group(string $column) {
         if (!strlen($this->_group)) {
             $this->_group = " GROUP BY {$column}";
         }
@@ -245,7 +245,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function having (string $condition) {
+    public function having(string $condition) {
         if (!strlen($this->_having)) {
             $this->_having = " HAVING {$condition}";
         }
@@ -262,7 +262,7 @@ 
      * @param bool $all
      * @return $this
      */
-    public function intersect (Select $select, $all = false) {
+    public function intersect(Select $select, $all = false) {
         $select = clone $select;
         $select->_order = '';
         $select->_limit = '';
@@ -280,7 +280,7 @@ 
      *
      * @return Predicate
      */
-    public function isEmpty () {
+    public function isEmpty() {
         return Predicate::factory($this->db, "NOT EXISTS ({$this->toSql()})");
     }
 
@@ -289,7 +289,7 @@ 
      *
      * @return Predicate
      */
-    public function isNotEmpty () {
+    public function isNotEmpty() {
         return Predicate::factory($this->db, "EXISTS ({$this->toSql()})");
     }
 
@@ -301,7 +301,7 @@ 
      * @param string $type
      * @return $this
      */
-    public function join ($table, string $condition, string $type = 'INNER') {
+    public function join($table, string $condition, string $type = 'INNER') {
         if ($table instanceof Select) {
             $table = $table->toSubquery();
         }
@@ -316,7 +316,7 @@ 
      * @param int $offset
      * @return $this
      */
-    public function limit (int $limit, int $offset = 0) {
+    public function limit(int $limit, int $offset = 0) {
         if ($limit == 0) {
             $this->_limit = '';
         }
@@ -335,7 +335,7 @@ 
      * @param int|string $ref Ordinal or reference name.
      * @return null|Column
      */
-    public function offsetGet ($ref) {
+    public function offsetGet($ref) {
         if (is_int($ref)) {
             return current(array_slice($this->refs, $ref, 1)) ?: null;
         }
@@ -348,7 +348,7 @@ 
      * @param string $order
      * @return $this
      */
-    public function order (string $order) {
+    public function order(string $order) {
         if (strlen($order)) {
             $order = " ORDER BY {$order}";
         }
@@ -359,7 +359,7 @@ 
     /**
      * @return Statement
      */
-    public function prepare () {
+    public function prepare() {
         return $this->db->prepare($this->toSql());
     }
 
@@ -367,7 +367,7 @@ 
      * @param string $alias
      * @return $this
      */
-    public function setAlias (string $alias) {
+    public function setAlias(string $alias) {
         $this->alias = $alias;
         foreach ($this->refs as $k => $column) {
             $this->refs[$k] = $column->setQualifier($alias);
@@ -385,7 +385,7 @@ 
      * @param string[] $expressions Keyed by alias if applicable.
      * @return $this
      */
-    public function setColumns (array $expressions) {
+    public function setColumns(array $expressions) {
         $this->refs = [];
         $_columns = [];
         foreach ($expressions as $alias => $expr) {
@@ -410,7 +410,7 @@ 
      * @param Closure $fetcher
      * @return $this
      */
-    public function setFetcher (Closure $fetcher) {
+    public function setFetcher(Closure $fetcher) {
         $this->fetcher = $fetcher;
         return $this;
     }
@@ -420,7 +420,7 @@ 
      *
      * @return string
      */
-    public function toSql (): string {
+    public function toSql(): string {
         $sql = "SELECT {$this->_columns} FROM {$this->table}";
         $sql .= $this->_join;
         $sql .= $this->_where;
@@ -437,7 +437,7 @@ 
      *
      * @return string
      */
-    public function toSubquery (): string {
+    public function toSubquery(): string {
         return "({$this->toSql()}) AS {$this->alias}";
     }
 
@@ -448,7 +448,7 @@ 
      * @param bool $all
      * @return $this
      */
-    public function union (Select $select, $all = false) {
+    public function union(Select $select, $all = false) {
         $select = clone $select;
         $select->_order = '';
         $select->_limit = '';
@@ -467,7 +467,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function where (string $condition) {
+    public function where(string $condition) {
         if (!strlen($this->_where)) {
             $this->_where = " WHERE {$condition}";
         }

src/DB/AttributesTrait.php

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
     /**
      * @return array
      */
-    public function getAttributes (): array {
+    public function getAttributes(): array {
         return $this->attributes ?? [];
     }
 
@@ -38,7 +38,7 @@ 
      * @param mixed $attr
      * @return bool
      */
-    public function offsetExists ($attr): bool {
+    public function offsetExists($attr): bool {
         return isset($this->attributes) and array_key_exists($attr, $this->attributes);
     }
 
@@ -46,7 +46,7 @@ 
      * @param mixed $attr
      * @return null|mixed
      */
-    public function offsetGet ($attr) {
+    public function offsetGet($attr) {
         return $this->attributes[$attr] ?? null;
     }
 
@@ -54,7 +54,7 @@ 
      * @param mixed $attr
      * @param mixed $value
      */
-    public function offsetSet ($attr, $value): void {
+    public function offsetSet($attr, $value): void {
         if (isset($attr)) {
             $this->attributes[$attr] = $value;
         }
@@ -66,7 +66,7 @@ 
     /**
      * @param mixed $attr
      */
-    public function offsetUnset ($attr): void {
+    public function offsetUnset($attr): void {
         unset($this->attributes[$attr]);
     }
 
@@ -74,7 +74,7 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function setAttributes (array $attributes) {
+    public function setAttributes(array $attributes) {
         $this->attributes = $attributes;
         return $this;
     }

Braces +1 added lines, -2 removed lines

@@ -57,8 +57,7 @@
     public function offsetSet ($attr, $value): void {
         if (isset($attr)) {
             $this->attributes[$attr] = $value;
-        }
-        else {
+        } else {
             $this->attributes[] = $value;
         }
     }

src/DB/AbstractTable.php

Spacing +6 added lines, -6 removed lines

@@ -16,13 +16,13 @@ 
      *
      * @return string
      */
-    abstract public function __toString ();
+    abstract public function __toString();
 
     /**
      * @param int|string $column
      * @return null|Column
      */
-    abstract public function offsetGet ($column);
+    abstract public function offsetGet($column);
 
     /**
      * @var DB
@@ -32,7 +32,7 @@ 
     /**
      * @param DB $db
      */
-    public function __construct (DB $db) {
+    public function __construct(DB $db) {
         $this->db = $db;
     }
 
@@ -40,7 +40,7 @@ 
      * @param int|string $column
      * @return bool
      */
-    public function offsetExists ($column): bool {
+    public function offsetExists($column): bool {
         return $this->offsetGet($column) !== null;
     }
 
@@ -51,7 +51,7 @@ 
      * @param void $value
      * @throws Exception
      */
-    final public function offsetSet ($offset, $value): void {
+    final public function offsetSet($offset, $value): void {
         throw new Exception('Tables are immutable.');
     }
 
@@ -61,7 +61,7 @@ 
      * @param void $name
      * @throws Exception
      */
-    final public function offsetUnset ($name): void {
+    final public function offsetUnset($name): void {
         $this->offsetSet($name, null);
     }
 }
\ No newline at end of file

src/DB/SQL/ComparisonTrait.php

Braces +1 added lines, -2 removed lines

@@ -64,8 +64,7 @@
         }
         if ($arg === null or is_bool($arg)) {
             $arg = ['' => 'NULL', 1 => 'TRUE', 0 => 'FALSE'][$arg];
-        }
-        else {
+        } else {
             $arg = $this->db->quote($arg);
         }
         if ($this->db->isMySQL()) {

Spacing +17 added lines, -17 removed lines

@@ -25,7 +25,7 @@ 
      * @param null|scalar|Select $arg
      * @return Predicate
      */
-    public function is ($arg): Predicate {
+    public function is($arg): Predicate {
         if ($arg instanceof Select) {
             if ($this->db->isSQLite()) {
                 return Select::factory($this->db, $arg, [$arg[0]])
@@ -53,7 +53,7 @@ 
      * @param number $max
      * @return Predicate
      */
-    public function isBetween ($min, $max) {
+    public function isBetween($min, $max) {
         $min = $this->db->quote($min);
         $max = $this->db->quote($max);
         return Predicate::factory($this->db, "{$this} BETWEEN {$min} AND {$max}");
@@ -65,7 +65,7 @@ 
      * @param scalar|array|Select $arg
      * @return Predicate
      */
-    public function isEqual ($arg) {
+    public function isEqual($arg) {
         return $this->db->match($this, $arg);
     }
 
@@ -74,7 +74,7 @@ 
      *
      * @return Predicate
      */
-    public function isFalse () {
+    public function isFalse() {
         return Predicate::factory($this->db, "{$this} IS FALSE");
     }
 
@@ -90,7 +90,7 @@ 
      * @param string $multi `ALL|ANY`
      * @return Predicate
      */
-    public function isGreater ($arg, string $multi = 'ALL') {
+    public function isGreater($arg, string $multi = 'ALL') {
         if ($arg instanceof Select) {
             if ($this->db->isSQLite()) {
                 $sub = Select::factory($this->db, $arg, [$arg[0]]);
@@ -116,7 +116,7 @@ 
      * @param string $multi `ALL|ANY`
      * @return Predicate
      */
-    public function isGreaterOrEqual ($arg, string $multi = 'ALL') {
+    public function isGreaterOrEqual($arg, string $multi = 'ALL') {
         if ($arg instanceof Select) {
             if ($this->db->isSQLite()) {
                 $sub = Select::factory($this->db, $arg, [$arg[0]]);
@@ -142,7 +142,7 @@ 
      * @param string $multi `ALL|ANY`
      * @return Predicate
      */
-    public function isLess ($arg, string $multi = 'ALL') {
+    public function isLess($arg, string $multi = 'ALL') {
         if ($arg instanceof Select) {
             if ($this->db->isSQLite()) {
                 $sub = Select::factory($this->db, $arg, [$arg[0]]);
@@ -168,7 +168,7 @@ 
      * @param string $multi `ALL|ANY`
      * @return Predicate
      */
-    public function isLessOrEqual ($arg, string $multi = 'ALL') {
+    public function isLessOrEqual($arg, string $multi = 'ALL') {
         if ($arg instanceof Select) {
             if ($this->db->isSQLite()) {
                 $sub = Select::factory($this->db, $arg, [$arg[0]]);
@@ -188,7 +188,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isLike (string $pattern) {
+    public function isLike(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return Predicate::factory($this->db, "{$this} LIKE {$pattern}");
     }
@@ -199,7 +199,7 @@ 
      * @param null|scalar|Select $arg
      * @return Predicate
      */
-    public function isNot ($arg) {
+    public function isNot($arg) {
         return $this->is($arg)->not();
     }
 
@@ -210,7 +210,7 @@ 
      * @param number $max
      * @return Predicate
      */
-    public function isNotBetween ($min, $max) {
+    public function isNotBetween($min, $max) {
         $min = $this->db->quote($min);
         $max = $this->db->quote($max);
         return Predicate::factory($this->db, "{$this} NOT BETWEEN {$min} AND {$max}");
@@ -222,7 +222,7 @@ 
      * @param scalar|array|Select $arg
      * @return Predicate
      */
-    public function isNotEqual ($arg) {
+    public function isNotEqual($arg) {
         if ($arg instanceof Select) {
             return Predicate::factory($this->db, "{$this} NOT IN ({$arg->toSql()})");
         }
@@ -238,7 +238,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isNotLike (string $pattern) {
+    public function isNotLike(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return Predicate::factory($this->db, "{$this} NOT LIKE {$pattern}");
     }
@@ -248,7 +248,7 @@ 
      *
      * @return Predicate
      */
-    public function isNotNull () {
+    public function isNotNull() {
         return Predicate::factory($this->db, "{$this} IS NOT NULL");
     }
 
@@ -258,7 +258,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isNotRegExp (string $pattern) {
+    public function isNotRegExp(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return Predicate::factory($this->db, "{$this} NOT REGEXP {$pattern}");
     }
@@ -268,7 +268,7 @@ 
      *
      * @return Predicate
      */
-    public function isNull () {
+    public function isNull() {
         return Predicate::factory($this->db, "{$this} IS NULL");
     }
 
@@ -278,7 +278,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isRegExp (string $pattern) {
+    public function isRegExp(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return Predicate::factory($this->db, "{$this} REGEXP {$pattern}");
     }

src/DB/SQL/Choice.php

Braces +3 added lines, -1 removed lines

@@ -85,8 +85,10 @@
      * @param string|ValueInterface $else
      * @return $this
      */
-    public function else ($else) {
+    public function else {
+        ($else) {
         $this->else = isset($else) ? $this->db->quote($else) : null;
+    }
         return $this;
     }
 

Spacing +4 added lines, -4 removed lines

@@ -59,7 +59,7 @@ 
      * @param null|string $subject
      * @param array $values `[when => then]` for the subject.
      */
-    public function __construct (DB $db, string $subject = null, array $values = []) {
+    public function __construct(DB $db, string $subject = null, array $values = []) {
         parent::__construct($db, '');
         $this->subject = $subject;
         $this->whenValues($values);
@@ -68,7 +68,7 @@ 
     /**
      * @return string
      */
-    public function __toString (): string {
+    public function __toString(): string {
         $sql = 'CASE';
         if (isset($this->subject)) {
             $sql .= " {$this->subject}";
@@ -99,7 +99,7 @@ 
      * @param string|ValueInterface $then
      * @return $this
      */
-    public function when ($expression, $then) {
+    public function when($expression, $then) {
         $this->values[$this->db->quote($expression)] = $this->db->quote($then);
         return $this;
     }
@@ -113,7 +113,7 @@ 
      * @param array $values `[when => then]`
      * @return $this
      */
-    public function whenValues (array $values) {
+    public function whenValues(array $values) {
         foreach ($values as $when => $then) {
             $this->when($when, $then);
         }