hfw / db

src/DB/SQL/ComparisonTrait.php

Spacing +16 added lines, -16 removed lines

@@ -28,7 +28,7 @@ 
      * @param array $values
      * @return Value
      */
-    public function coalesce (array $values) {
+    public function coalesce(array $values) {
         array_unshift($values, $this);
         $values = $this->db->quoteList($values);
         return new Value($this->db, "COALESCE({$values})");
@@ -40,7 +40,7 @@ 
      * @param array $values `[when => then]`
      * @return Choice
      */
-    public function getChoice (array $values) {
+    public function getChoice(array $values) {
         return new Choice($this->db, "{$this}", $values);
     }
 
@@ -53,7 +53,7 @@ 
      * @param null|bool|number|string|Select $arg
      * @return Predicate
      */
-    public function is ($arg): Predicate {
+    public function is($arg): Predicate {
         $driver = $this->db->getDriver();
         if ($arg instanceof Select) {
             switch ($driver) {
@@ -81,7 +81,7 @@ 
      * @param number|string $max
      * @return Predicate
      */
-    public function isBetween ($min, $max) {
+    public function isBetween($min, $max) {
         $min = $this->db->quote($min);
         $max = $this->db->quote($max);
         return new Predicate("{$this} BETWEEN {$min} AND {$max}");
@@ -93,7 +93,7 @@ 
      * @param bool|number|string|array|Select $arg
      * @return Predicate
      */
-    public function isEqual ($arg) {
+    public function isEqual($arg) {
         return $this->db->match($this, $arg);
     }
 
@@ -109,7 +109,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) {
             switch ($this->db) {
                 case 'sqlite':
@@ -139,7 +139,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) {
             switch ($this->db) {
                 case 'sqlite':
@@ -169,7 +169,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) {
             switch ($this->db) {
                 case 'sqlite':
@@ -199,7 +199,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) {
             switch ($this->db) {
                 case 'sqlite':
@@ -223,7 +223,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isLike (string $pattern) {
+    public function isLike(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return new Predicate("{$this} LIKE {$pattern}");
     }
@@ -234,7 +234,7 @@ 
      * @param null|bool|number|string|Select $arg
      * @return Predicate
      */
-    public function isNot ($arg) {
+    public function isNot($arg) {
         return $this->is($arg)->invert();
     }
 
@@ -245,7 +245,7 @@ 
      * @param number|string $max
      * @return Predicate
      */
-    public function isNotBetween ($min, $max) {
+    public function isNotBetween($min, $max) {
         $min = $this->db->quote($min);
         $max = $this->db->quote($max);
         return new Predicate("{$this} NOT BETWEEN {$min} AND {$max}");
@@ -257,7 +257,7 @@ 
      * @param bool|number|string|array|Select $arg
      * @return Predicate
      */
-    public function isNotEqual ($arg) {
+    public function isNotEqual($arg) {
         if ($arg instanceof Select) {
             return new Predicate("{$this} NOT IN ({$arg->toSql()})");
         }
@@ -273,7 +273,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isNotLike (string $pattern) {
+    public function isNotLike(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return new Predicate("{$this} NOT LIKE {$pattern}");
     }
@@ -284,7 +284,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isNotRegExp (string $pattern) {
+    public function isNotRegExp(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return new Predicate("{$this} NOT REGEXP {$pattern}");
     }
@@ -295,7 +295,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isRegExp (string $pattern) {
+    public function isRegExp(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return new Predicate("{$this} REGEXP {$pattern}");
     }

Braces +1 added lines, -2 removed lines

@@ -66,8 +66,7 @@
         }
         if ($arg === null or is_bool($arg)) {
             $arg = ['' => 'NULL', 1 => 'TRUE', 0 => 'FALSE'][$arg];
-        }
-        else {
+        } else {
             $arg = $this->db->quote($arg);
         }
         $oper = ['mysql' => '<=>', 'sqlite' => 'IS'][$driver];

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;
         asort($columns);
@@ -53,7 +53,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->name;
     }
 
@@ -63,7 +63,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 = $this->db->quoteList($values);
         switch ($this->db) {
@@ -85,7 +85,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();
     }
 
@@ -93,7 +93,7 @@ 
      * @param array $match `[a => b]`
      * @return int
      */
-    public function count (array $match = []) {
+    public function count(array $match = []) {
         $select = $this->select(['COUNT(*)']);
         foreach ($match as $a => $b) {
             $select->where($this->db->match($this[$a] ?? $a, $b));
@@ -109,7 +109,7 @@ 
      * @param array $match
      * @return int Rows affected.
      */
-    public function delete (array $match): int {
+    public function delete(array $match): int {
         foreach ($match as $a => $b) {
             $match[$a] = $this->db->match($this[$a] ?? $a, $b);
         }
@@ -120,14 +120,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;
     }
 
@@ -137,7 +137,7 @@ 
      * @param array $values
      * @return Statement
      */
-    public function insert (array $values) {
+    public function insert(array $values) {
         $columns = implode(',', array_keys($values));
         $values = $this->db->quoteList($values);
         return $this->db->query("INSERT INTO {$this} ($columns) VALUES ($values)");
@@ -147,7 +147,7 @@ 
      * @param string $name
      * @return bool
      */
-    public function offsetExists ($name): bool {
+    public function offsetExists($name): bool {
         return isset($this->columns[$name]);
     }
 
@@ -155,7 +155,7 @@ 
      * @param string $name
      * @return Column
      */
-    public function offsetGet ($name) {
+    public function offsetGet($name) {
         return $this->columns[$name];
     }
 
@@ -165,7 +165,7 @@ 
      * @param string[] $columns Defaults to all columns.
      * @return Select
      */
-    public function select (array $columns = []) {
+    public function select(array $columns = []) {
         if (empty($columns)) {
             $columns = $this->columns;
         }
@@ -178,7 +178,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) {
@@ -196,7 +196,7 @@ 
      * @param array $match
      * @return int Rows affected.
      */
-    public function update (array $values, array $match): int {
+    public function update(array $values, array $match): int {
         foreach ($this->db->quoteArray($values) as $key => $value) {
             $values[$key] = "{$key} = {$value}";
         }

src/DB/SQL/Predicate.php

Spacing +3 added lines, -3 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 new static(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 new static(reset($conditions));
         }
@@ -42,7 +42,7 @@ 
      *
      * @return Predicate
      */
-    public function invert () {
+    public function invert() {
         return new static("NOT({$this})");
     }
 }
\ No newline at end of file

src/DB/Select.php

Braces +7 added lines, -14 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}";
@@ -454,8 +449,7 @@ 
         $select->_limit = '';
         if ($all) {
             $this->_import .= " UNION ALL {$select->toSql()}";
-        }
-        else {
+        } else {
             $this->_import .= " UNION {$select->toSql()}";
         }
         return $this;
@@ -470,8 +464,7 @@ 
     public function where (string $condition) {
         if (!strlen($this->_where)) {
             $this->_where = " WHERE {$condition}";
-        }
-        else {
+        } else {
             $this->_where .= " AND {$condition}";
         }
         return $this;

Spacing +27 added lines, -27 removed lines

@@ -112,7 +112,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();
@@ -132,7 +132,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function __invoke (array $args = []) {
+    public function __invoke(array $args = []) {
         return $this->execute($args);
     }
 
@@ -141,7 +141,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->alias;
     }
 
@@ -151,7 +151,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 = '';
@@ -164,7 +164,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());
         }
@@ -179,7 +179,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)));
     }
 
@@ -192,7 +192,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));
     }
 
@@ -204,7 +204,7 @@ 
      * @param array $args
      * @return mixed
      */
-    public function getFirst (array $args = []) {
+    public function getFirst(array $args = []) {
         return $this->getEach($args)->current();
     }
 
@@ -215,7 +215,7 @@ 
      *
      * @return Generator
      */
-    public function getIterator () {
+    public function getIterator() {
         yield from $this->getEach();
     }
 
@@ -225,7 +225,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}";
         }
@@ -241,7 +241,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function having (string $condition) {
+    public function having(string $condition) {
         if (!strlen($this->_having)) {
             $this->_having = " HAVING {$condition}";
         }
@@ -258,7 +258,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 = '';
@@ -276,7 +276,7 @@ 
      *
      * @return Predicate
      */
-    public function isEmpty () {
+    public function isEmpty() {
         return new Predicate("NOT EXISTS ({$this->toSql()})");
     }
 
@@ -285,7 +285,7 @@ 
      *
      * @return Predicate
      */
-    public function isNotEmpty () {
+    public function isNotEmpty() {
         return new Predicate("EXISTS ({$this->toSql()})");
     }
 
@@ -297,7 +297,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();
         }
@@ -312,7 +312,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 = '';
         }
@@ -331,7 +331,7 @@ 
      * @param mixed $offset Ordinal or reference name.
      * @return bool
      */
-    public function offsetExists ($offset): bool {
+    public function offsetExists($offset): bool {
         return isset($this->refs[$offset]);
     }
 
@@ -341,7 +341,7 @@ 
      * @param mixed $offset Ordinal or reference name.
      * @return Column
      */
-    public function offsetGet ($offset) {
+    public function offsetGet($offset) {
         return $this->refs[$offset];
     }
 
@@ -351,7 +351,7 @@ 
      * @param string $order
      * @return $this
      */
-    public function order (string $order) {
+    public function order(string $order) {
         if (strlen($order)) {
             $order = " ORDER BY {$order}";
         }
@@ -362,7 +362,7 @@ 
     /**
      * @return Statement
      */
-    public function prepare () {
+    public function prepare() {
         return $this->db->prepare($this->toSql());
     }
 
@@ -370,7 +370,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);
@@ -384,7 +384,7 @@ 
      * @param string[] $columns
      * @return $this
      */
-    public function setColumns (array $columns) {
+    public function setColumns(array $columns) {
         $this->refs = [];
         $_columns = [];
         $i = 0;
@@ -413,7 +413,7 @@ 
      * @param Closure $fetcher
      * @return $this
      */
-    public function setFetcher (Closure $fetcher) {
+    public function setFetcher(Closure $fetcher) {
         $this->fetcher = $fetcher;
         return $this;
     }
@@ -423,7 +423,7 @@ 
      *
      * @return string
      */
-    public function toSql (): string {
+    public function toSql(): string {
         $sql = "SELECT {$this->_columns} FROM {$this->table}";
         $sql .= $this->_join;
         $sql .= $this->_where;
@@ -440,7 +440,7 @@ 
      *
      * @return string
      */
-    public function toSubquery (): string {
+    public function toSubquery(): string {
         return "({$this->toSql()}) AS {$this->alias}";
     }
 
@@ -451,7 +451,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 = '';
@@ -470,7 +470,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 $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,14 +54,14 @@ 
      * @param mixed $attr
      * @param mixed $value
      */
-    public function offsetSet ($attr, $value): void {
+    public function offsetSet($attr, $value): void {
         $this->attributes[$attr] = $value;
     }
 
     /**
      * @param mixed $attr
      */
-    public function offsetUnset ($attr): void {
+    public function offsetUnset($attr): void {
         unset($this->attributes[$attr]);
     }
 
@@ -69,7 +69,7 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function setAttributes (array $attributes) {
+    public function setAttributes(array $attributes) {
         $this->attributes = $attributes;
         return $this;
     }