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/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/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 +22 added lines, -22 removed lines

@@ -25,7 +25,7 @@ 
      * @return Predicate
      * @internal
      */
-    protected function _isRelational ($arg, string $oper, string $multi) {
+    protected function _isRelational($arg, string $oper, string $multi) {
         static $inverse = [
             '<' => '>=',
             '<=' => '>',
@@ -54,7 +54,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]])
@@ -82,7 +82,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}");
@@ -94,7 +94,7 @@ 
      * @param scalar|array|Select $arg
      * @return Predicate
      */
-    public function isEqual ($arg) {
+    public function isEqual($arg) {
         return $this->db->match($this, $arg);
     }
 
@@ -103,7 +103,7 @@ 
      *
      * @return Predicate
      */
-    public function isFalse () {
+    public function isFalse() {
         return Predicate::factory($this->db, "{$this} IS FALSE");
     }
 
@@ -113,7 +113,7 @@ 
      * @param number|string|Select $arg
      * @return Predicate
      */
-    public function isGt ($arg) {
+    public function isGt($arg) {
         return $this->_isRelational($arg, '>', 'ALL');
     }
 
@@ -123,7 +123,7 @@ 
      * @param Select $select
      * @return Predicate
      */
-    public function isGtAny (Select $select) {
+    public function isGtAny(Select $select) {
         return $this->_isRelational($select, '>', 'ANY');
     }
 
@@ -133,7 +133,7 @@ 
      * @param number|string|Select $arg
      * @return Predicate
      */
-    public function isGte ($arg) {
+    public function isGte($arg) {
         return $this->_isRelational($arg, '>=', 'ALL');
     }
 
@@ -143,7 +143,7 @@ 
      * @param Select $select
      * @return Predicate
      */
-    public function isGteAny (Select $select) {
+    public function isGteAny(Select $select) {
         return $this->_isRelational($select, '>=', 'ANY');
     }
 
@@ -153,7 +153,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}");
     }
@@ -164,7 +164,7 @@ 
      * @param number|string|Select $arg
      * @return Predicate
      */
-    public function isLt ($arg) {
+    public function isLt($arg) {
         return $this->_isRelational($arg, '<', 'ALL');
     }
 
@@ -174,7 +174,7 @@ 
      * @param Select $select
      * @return Predicate
      */
-    public function isLtAny (Select $select) {
+    public function isLtAny(Select $select) {
         return $this->_isRelational($select, '<', 'ANY');
     }
 
@@ -184,7 +184,7 @@ 
      * @param number|string|Select $arg
      * @return Predicate
      */
-    public function isLte ($arg) {
+    public function isLte($arg) {
         return $this->_isRelational($arg, '<=', 'ALL');
     }
 
@@ -194,7 +194,7 @@ 
      * @param Select $select
      * @return Predicate
      */
-    public function isLteAny (Select $select) {
+    public function isLteAny(Select $select) {
         return $this->_isRelational($select, '<=', 'ANY');
     }
 
@@ -204,7 +204,7 @@ 
      * @param null|scalar|Select $arg
      * @return Predicate
      */
-    public function isNot ($arg) {
+    public function isNot($arg) {
         return $this->is($arg)->not();
     }
 
@@ -215,7 +215,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}");
@@ -227,7 +227,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()})");
         }
@@ -243,7 +243,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}");
     }
@@ -253,7 +253,7 @@ 
      *
      * @return Predicate
      */
-    public function isNotNull () {
+    public function isNotNull() {
         return Predicate::factory($this->db, "{$this} IS NOT NULL");
     }
 
@@ -263,7 +263,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}");
     }
@@ -273,7 +273,7 @@ 
      *
      * @return Predicate
      */
-    public function isNull () {
+    public function isNull() {
         return Predicate::factory($this->db, "{$this} IS NULL");
     }
 
@@ -283,7 +283,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);
         }

src/DB/SQL.php

Spacing +5 added lines, -5 removed lines

@@ -18,11 +18,11 @@ 
      * @param int|array|Countable $count
      * @return ExpressionInterface[]
      */
-    public static function marks ($count): array {
+    public static function marks($count): array {
         static $mark;
         $mark ??= new class implements ExpressionInterface {
 
-            public function __toString () {
+            public function __toString() {
                 return '?';
             }
         };
@@ -41,7 +41,7 @@ 
      * @param string[] $columns
      * @return string[] `["column" => ":column"]`
      */
-    public static function slots (array $columns): array {
+    public static function slots(array $columns): array {
         $slots = [];
         foreach ($columns as $column) {
             $slots[$column] = ':' . str_replace('.', '__', $column);
@@ -53,7 +53,7 @@ 
      * @param string[] $columns
      * @return string[] `["column" => "column=:column"]`
      */
-    public static function slotsEqual (array $columns): array {
+    public static function slotsEqual(array $columns): array {
         $slots = static::slots($columns);
         foreach ($slots as $column => $slot) {
             $slots[$column] = "{$column} = {$slot}";
@@ -61,6 +61,6 @@ 
         return $slots;
     }
 
-    final private function __construct () {
+    final private function __construct() {
     }
 }
\ No newline at end of file

src/DB/SQL/Predicate.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
      *
      * @return static
      */
-    public function not () {
+    public function not() {
         return static::factory($this->db, "NOT({$this})");
     }