hfw / db

src/DB/SQL/Scalar.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     use ComparisonTrait;
     use AggregateTrait;
 
-    public function __construct (DB $db, string $expression) {
+    public function __construct(DB $db, string $expression) {
         $this->db = $db;
         parent::__construct($expression);
     }

src/DB/SQL/AggregateTrait.php

Spacing +6 added lines, -6 removed lines

@@ -20,7 +20,7 @@ 
      * @param string $aggregate `ALL|DISTINCT`
      * @return Numeric
      */
-    public function getAvg ($aggregate = 'ALL') {
+    public function getAvg($aggregate = 'ALL') {
         return new Numeric($this->db, "AVG({$aggregate} {$this})");
     }
 
@@ -30,7 +30,7 @@ 
      * @param string $delimiter
      * @return Text
      */
-    public function getConcat (string $delimiter = ',') {
+    public function getConcat(string $delimiter = ',') {
         $delimiter = $this->db->quote($delimiter);
         switch ($this->db->getDriver()) {
             case 'sqlite':
@@ -46,7 +46,7 @@ 
      * @param string $aggregate `ALL|DISTINCT`
      * @return Numeric
      */
-    public function getCount ($aggregate = 'ALL') {
+    public function getCount($aggregate = 'ALL') {
         return new Numeric($this->db, "COUNT({$aggregate} {$this})");
     }
 
@@ -55,7 +55,7 @@ 
      *
      * @return Numeric
      */
-    public function getMax () {
+    public function getMax() {
         return new Numeric($this->db, "MAX({$this})");
     }
 
@@ -64,7 +64,7 @@ 
      *
      * @return Numeric
      */
-    public function getMin () {
+    public function getMin() {
         return new Numeric($this->db, "MIN({$this})");
     }
 
@@ -74,7 +74,7 @@ 
      * @param string $aggregate `ALL|DISTINCT`
      * @return Numeric
      */
-    public function getSum ($aggregate = 'ALL') {
+    public function getSum($aggregate = 'ALL') {
         return new Numeric($this->db, "SUM({$aggregate} {$this})");
     }
 }
\ No newline at end of file

src/DB/SQL/ExpressionInterface.php

Spacing +1 added lines, -1 removed lines

@@ -7,6 +7,6 @@
  */
 interface ExpressionInterface {
 
-    public function __toString ();
+    public function __toString();
 
 }
\ No newline at end of file

src/DB/SQL/Predicate.php

Spacing +5 added lines, -5 removed lines

@@ -17,7 +17,7 @@ 
      * @param string[] $conditions
      * @return Predicate
      */
-    public static function all (array $conditions) {
+    public static function all(array $conditions) {
         if (count($conditions) === 1) {
             return reset($conditions);
         }
@@ -30,7 +30,7 @@ 
      * @param string[] $conditions
      * @return Predicate
      */
-    public static function any (array $conditions) {
+    public static function any(array $conditions) {
         if (count($conditions) === 1) {
             return reset($conditions);
         }
@@ -57,7 +57,7 @@ 
      * @param string $listOper
      * @return Predicate
      */
-    public static function compare ($a, $b, $oper = '=', $subOper = 'ANY', $listOper = 'IN') {
+    public static function compare($a, $b, $oper = '=', $subOper = 'ANY', $listOper = 'IN') {
         if (is_array($b)) {
             return new static("{$a} {$listOper} (" . implode(',', $b) . ")");
         }
@@ -79,7 +79,7 @@ 
      * @param string $listOper
      * @return Predicate[]
      */
-    public static function compareArray (array $values, $oper = '=', $subOper = 'ANY', $listOper = 'IN') {
+    public static function compareArray(array $values, $oper = '=', $subOper = 'ANY', $listOper = 'IN') {
         foreach ($values as $a => $b) {
             $values[$a] = static::compare($a, $b, $oper, $subOper, $listOper);
         }
@@ -91,7 +91,7 @@ 
      *
      * @return Predicate
      */
-    public function invert () {
+    public function invert() {
         return new static("NOT({$this})");
     }
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -60,8 +60,7 @@
     public static function compare ($a, $b, $oper = '=', $subOper = 'ANY', $listOper = 'IN') {
         if (is_array($b)) {
             return new static("{$a} {$listOper} (" . implode(',', $b) . ")");
-        }
-        elseif ($b instanceof Select) {
+        } elseif ($b instanceof Select) {
             return new static("{$a} {$oper} {$subOper} ({$b->toSql()})");
         }
         return new static("{$a} {$oper} {$b}");

src/DB/Select.php

Braces +4 added lines, -8 removed lines

@@ -173,8 +173,7 @@ 
     public function group (string $column) {
         if (!strlen($this->_group)) {
             $this->_group = " GROUP BY {$column}";
-        }
-        else {
+        } else {
             $this->_group .= ", {$column}";
         }
         return $this;
@@ -189,8 +188,7 @@ 
     public function having (string $condition) {
         if (!strlen($this->_having)) {
             $this->_having = " HAVING {$condition}";
-        }
-        else {
+        } else {
             $this->_having .= " AND {$condition}";
         }
         return $this;
@@ -222,8 +220,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}";
@@ -314,8 +311,7 @@ 
     public function where (string $condition) {
         if (!strlen($this->_where)) {
             $this->_where = " WHERE {$condition}";
-        }
-        else {
+        } else {
             $this->_where .= " AND {$condition}";
         }
         return $this;

Spacing +21 added lines, -21 removed lines

@@ -73,7 +73,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) {
             $table = $table->toSubquery();
@@ -95,7 +95,7 @@ 
     /**
      * Gives the clone a new alias.
      */
-    public function __clone () {
+    public function __clone() {
         $this->alias = uniqid('_') . "__{$this->table}";
     }
 
@@ -103,7 +103,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function __invoke (array $args = []) {
+    public function __invoke(array $args = []) {
         return $this->execute($args);
     }
 
@@ -112,7 +112,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->alias;
     }
 
@@ -122,7 +122,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(*)';
         return (int)$clone->execute($args)->fetchColumn();
@@ -134,7 +134,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());
         }
@@ -149,7 +149,7 @@ 
      * @param array $args Execution arguments.
      * @return array
      */
-    public function fetchAll (array $args = []): array {
+    public function fetchAll(array $args = []): array {
         return iterator_to_array($this->fetcher->__invoke($this->execute($args)));
     }
 
@@ -162,7 +162,7 @@ 
      * @param array $args Execution arguments.
      * @return Generator
      */
-    public function fetchEach (array $args = []) {
+    public function fetchEach(array $args = []) {
         yield from $this->fetcher->__invoke($this->execute($args));
     }
 
@@ -173,7 +173,7 @@ 
      *
      * @return Generator
      */
-    public function getIterator () {
+    public function getIterator() {
         yield from $this->fetchEach();
     }
 
@@ -183,7 +183,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}";
         }
@@ -199,7 +199,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function having (string $condition) {
+    public function having(string $condition) {
         if (!strlen($this->_having)) {
             $this->_having = " HAVING {$condition}";
         }
@@ -217,7 +217,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();
         }
@@ -232,7 +232,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 = '';
         }
@@ -251,7 +251,7 @@ 
      * @param string $name Name or alias if used.
      * @return bool
      */
-    public function offsetExists ($name): bool {
+    public function offsetExists($name): bool {
         return true;
     }
 
@@ -261,7 +261,7 @@ 
      * @param string $name Name, or alias if used.
      * @return Column
      */
-    public function offsetGet ($name) {
+    public function offsetGet($name) {
         return new Column($this->db, $name, $this->alias);
     }
 
@@ -271,7 +271,7 @@ 
      * @param string $order
      * @return $this
      */
-    public function order (string $order) {
+    public function order(string $order) {
         if (strlen($order)) {
             $order = " ORDER BY {$order}";
         }
@@ -282,7 +282,7 @@ 
     /**
      * @return Statement
      */
-    public function prepare () {
+    public function prepare() {
         return $this->db->prepare($this->toSql());
     }
 
@@ -290,7 +290,7 @@ 
      * @param Closure $fetcher
      * @return $this
      */
-    public function setFetcher (Closure $fetcher) {
+    public function setFetcher(Closure $fetcher) {
         $this->fetcher = $fetcher;
         return $this;
     }
@@ -298,7 +298,7 @@ 
     /**
      * @return string
      */
-    public function toSql (): string {
+    public function toSql(): string {
         $sql = "SELECT {$this->_columns} FROM {$this->table}";
         $sql .= $this->_join;
         $sql .= $this->_where;
@@ -314,7 +314,7 @@ 
      *
      * @return string
      */
-    public function toSubquery (): string {
+    public function toSubquery(): string {
         return "({$this->toSql()}) AS {$this->alias}";
     }
 
@@ -324,7 +324,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/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 +4 added lines, -4 removed lines

@@ -29,7 +29,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);
         }
@@ -52,7 +52,7 @@ 
      * @param string $table
      * @param Record[] $records
      */
-    public function __construct (DB $db, string $table, array $records) {
+    public function __construct(DB $db, string $table, array $records) {
         parent::__construct($db, $table, array_keys($records));
         $this->records = $records;
     }
@@ -66,7 +66,7 @@ 
      * @param array $match
      * @return Select
      */
-    public function getCollection (string $key, array $match = []) {
+    public function getCollection(string $key, array $match = []) {
         $record = $this->records[$key];
         $select = $record->select();
         $select->join($this, $this[$key]->isEqual($record['id']));
@@ -82,7 +82,7 @@ 
      * @param int[] $ids Keyed by column.
      * @return int Rows affected.
      */
-    public function link (array $ids): int {
+    public function link(array $ids): int {
         $link = $this->cache(__FUNCTION__, function() {
             $columns = implode(',', array_keys($this->columns));
             $slots = implode(',', SQL::slots(array_keys($this->columns)));

src/DB/EAV.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
      * @param DB $db
      * @param $name
      */
-    public function __construct (DB $db, $name) {
+    public function __construct(DB $db, $name) {
         parent::__construct($db, $name, ['entity', 'attribute', 'value']);
     }
 
@@ -25,7 +25,7 @@ 
      * @param string $attribute
      * @return bool
      */
-    public function exists (int $id, string $attribute): bool {
+    public function exists(int $id, string $attribute): bool {
         $exists = $this->cache(__FUNCTION__, function() {
             $select = $this->select(['COUNT(*) > 0']);
             $select->where('entity = ? AND attribute = ?');
@@ -43,7 +43,7 @@ 
      * @param array $match `[attribute => value]`. If empty, selects all IDs for entities having at least one attribute.
      * @return Select
      */
-    public function find (array $match) {
+    public function find(array $match) {
         $select = $this->select([$this['entity']]);
         $prior = $this;
         foreach ($match as $attribute => $value) {
@@ -65,7 +65,7 @@ 
      * @param int $id
      * @return array `[attribute => value]`
      */
-    public function load (int $id): array {
+    public function load(int $id): array {
         $load = $this->cache(__FUNCTION__, function() {
             $select = $this->select(['attribute', 'value']);
             $select->where('entity = ?');
@@ -81,7 +81,7 @@ 
      * @param int[] $ids
      * @return array[] `[id => attribute => value]
      */
-    public function loadAll (array $ids): array {
+    public function loadAll(array $ids): array {
         if (empty($ids)) {
             return [];
         }
@@ -106,7 +106,7 @@ 
      * @param array $values `[attribute => value]`
      * @return $this
      */
-    public function save (int $id, array $values) {
+    public function save(int $id, array $values) {
         $this->delete([
             $this['entity']->isEqual($id),
             $this['attribute']->isNotEqual(array_keys($values))

src/DB/SQL/NumericTrait.php

Spacing +14 added lines, -14 removed lines

@@ -19,7 +19,7 @@ 
      *
      * @return Numeric
      */
-    public function abs () {
+    public function abs() {
         return new Numeric($this->db, "ABS({$this})");
     }
 
@@ -29,7 +29,7 @@ 
      * @param number|ExpressionInterface $arg
      * @return Numeric
      */
-    public function add ($arg) {
+    public function add($arg) {
         return new Numeric($this->db, "({$this} + {$arg})");
     }
 
@@ -38,7 +38,7 @@ 
      *
      * @return Numeric
      */
-    public function ceil () {
+    public function ceil() {
         return new Numeric($this->db, "CEIL({$this})");
     }
 
@@ -48,7 +48,7 @@ 
      * @param number|ExpressionInterface $arg
      * @return Numeric
      */
-    public function divide ($arg) {
+    public function divide($arg) {
         return new Numeric($this->db, "({$this} / {$arg})");
     }
 
@@ -57,7 +57,7 @@ 
      *
      * @return Numeric
      */
-    public function floor () {
+    public function floor() {
         return new Numeric($this->db, "FLOOR({$this})");
     }
 
@@ -66,7 +66,7 @@ 
      *
      * @return Predicate
      */
-    public function isEven () {
+    public function isEven() {
         return new Predicate("({$this} % 2) = 0");
     }
 
@@ -75,7 +75,7 @@ 
      *
      * @return Predicate
      */
-    public function isNegative () {
+    public function isNegative() {
         return new Predicate("{$this} < 0");
     }
 
@@ -84,7 +84,7 @@ 
      *
      * @return Predicate
      */
-    public function isOdd () {
+    public function isOdd() {
         return new Predicate("({$this} % 2) <> 0");
     }
 
@@ -93,7 +93,7 @@ 
      *
      * @return Predicate
      */
-    public function isPositive () {
+    public function isPositive() {
         return new Predicate("{$this} > 0");
     }
 
@@ -103,7 +103,7 @@ 
      * @param number|ExpressionInterface $arg
      * @return Numeric
      */
-    public function modulo ($arg) {
+    public function modulo($arg) {
         return new Numeric($this->db, "({$this} % {$arg})");
     }
 
@@ -113,7 +113,7 @@ 
      * @param number|ExpressionInterface $arg
      * @return Numeric
      */
-    public function multiply ($arg) {
+    public function multiply($arg) {
         return new Numeric($this->db, "({$this} * {$arg})");
     }
 
@@ -123,7 +123,7 @@ 
      * @param number|ExpressionInterface $exponent
      * @return Numeric
      */
-    public function pow ($exponent) {
+    public function pow($exponent) {
         return new Numeric($this->db, "POW({$this},{$exponent})");
     }
 
@@ -133,7 +133,7 @@ 
      * @param int $decimals
      * @return Numeric
      */
-    public function round (int $decimals = 0) {
+    public function round(int $decimals = 0) {
         return new Numeric($this->db, "ROUND({$this},{$decimals})");
     }
 
@@ -143,7 +143,7 @@ 
      * @param number|ExpressionInterface $arg
      * @return Numeric
      */
-    public function subtract ($arg) {
+    public function subtract($arg) {
         return new Numeric($this->db, "({$this} - {$arg})");
     }
 }
\ No newline at end of file

src/DB/Table.php

Spacing +14 added lines, -14 removed lines

@@ -39,7 +39,7 @@ 
      * @param string $name
      * @param string[] $columns
      */
-    public function __construct (DB $db, $name, array $columns) {
+    public function __construct(DB $db, $name, array $columns) {
         parent::__construct($db);
         $this->name = $name;
         foreach ($columns as $column) {
@@ -52,7 +52,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->name;
     }
 
@@ -62,7 +62,7 @@ 
      * @param array $values
      * @return int Rows affected.
      */
-    public function apply (array $values): int {
+    public function apply(array $values): int {
         $columns = implode(',', array_keys($values));
         $values = implode(', ', $this->db->quoteArray($values));
         if ($this->db->getDriver() === 'sqlite') {
@@ -78,7 +78,7 @@ 
      * @param Closure $prepare `():Statement`
      * @return Statement
      */
-    protected function cache (string $key, Closure $prepare) {
+    protected function cache(string $key, Closure $prepare) {
         return $this->_cache[$key] ?? $this->_cache[$key] = $prepare->__invoke();
     }
 
@@ -86,7 +86,7 @@ 
      * @param array $match
      * @return int
      */
-    public function count (array $match = []) {
+    public function count(array $match = []) {
         $select = $this->select(['COUNT(*)']);
         foreach ($this->db->matchArray($match) as $condition) {
             $select->where($condition);
@@ -102,7 +102,7 @@ 
      * @param array $match
      * @return int Rows affected.
      */
-    public function delete (array $match): int {
+    public function delete(array $match): int {
         $match = Predicate::all($this->db->matchArray($match));
         return $this->db->exec("DELETE FROM {$this} WHERE {$match}");
     }
@@ -110,14 +110,14 @@ 
     /**
      * @return Column[]
      */
-    final public function getColumns (): array {
+    final public function getColumns(): array {
         return $this->columns;
     }
 
     /**
      * @return string
      */
-    final public function getName (): string {
+    final public function getName(): string {
         return $this->name;
     }
 
@@ -127,7 +127,7 @@ 
      * @param array $values
      * @return Statement
      */
-    public function insert (array $values) {
+    public function insert(array $values) {
         $columns = implode(',', array_keys($values));
         $values = implode(', ', $this->db->quoteArray($values));
         return $this->db->query("INSERT INTO {$this} ($columns) VALUES ($values)");
@@ -137,7 +137,7 @@ 
      * @param string $name
      * @return bool
      */
-    public function offsetExists ($name): bool {
+    public function offsetExists($name): bool {
         return isset($this->columns[$name]);
     }
 
@@ -145,7 +145,7 @@ 
      * @param string $name
      * @return Column
      */
-    public function offsetGet ($name) {
+    public function offsetGet($name) {
         return $this->columns[$name];
     }
 
@@ -155,7 +155,7 @@ 
      * @param string[] $columns Defaults to all columns.
      * @return Select
      */
-    public function select (array $columns = []) {
+    public function select(array $columns = []) {
         if (!$columns) {
             $columns = array_values($this->columns);
         }
@@ -168,7 +168,7 @@ 
      * @param string $name
      * @return Table
      */
-    public function setName (string $name) {
+    public function setName(string $name) {
         $clone = clone $this;
         $clone->name = $name;
         foreach ($this->columns as $name => $column) {
@@ -186,7 +186,7 @@ 
      * @param array $match
      * @return int Rows affected.
      */
-    public function update (array $values, array $match): int {
+    public function update(array $values, array $match): int {
         $values = implode(', ', $this->db->matchArray($values));
         $match = Predicate::all($this->db->matchArray($match));
         return $this->db->exec("UPDATE {$this} SET {$values} WHERE {$match}");