hfw / db

src/DB/Select.php

Spacing +20 added lines, -20 removed lines

@@ -79,7 +79,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 = []): Statement {
+    public function __invoke(array $args = []): Statement {
         return $this->execute($args);
     }
 
@@ -112,7 +112,7 @@ 
      *
      * @return string
      */
-    public function __toString (): string {
+    public function __toString(): string {
         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 = []): Statement {
+    public function execute(array $args = []): Statement {
         if ($args) {
             return $this->prepare()->execute($args);
         }
@@ -149,7 +149,7 @@ 
      * @param array $args Execution arguments.
      * @return array
      */
-    public function fetchAll (array $args = []): array {
+    public function fetchAll(array $args = []): array {
         return $this->fetcher->__invoke($this->execute($args));
     }
 
@@ -160,7 +160,7 @@ 
      *
      * @return ArrayIterator
      */
-    public function getIterator () {
+    public function getIterator() {
         return new ArrayIterator($this->fetchAll());
     }
 
@@ -170,7 +170,7 @@ 
      * @param string $column
      * @return $this
      */
-    public function group (string $column) {
+    public function group(string $column) {
         $this->_group[] = $column;
         return $this;
     }
@@ -181,7 +181,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function having (string $condition) {
+    public function having(string $condition) {
         $this->_having[] = $condition;
         return $this;
     }
@@ -194,7 +194,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();
         }
@@ -209,7 +209,7 @@ 
      * @param int $offset
      * @return $this
      */
-    public function limit (int $limit, int $offset = 0) {
+    public function limit(int $limit, int $offset = 0) {
         $this->_limit = $limit;
         $this->_offset = $offset;
         return $this;
@@ -221,7 +221,7 @@ 
      * @param string $name Name or alias if used.
      * @return bool
      */
-    public function offsetExists ($name): bool {
+    public function offsetExists($name): bool {
         return true;
     }
 
@@ -231,7 +231,7 @@ 
      * @param string $name Name, or alias if used.
      * @return Column
      */
-    public function offsetGet ($name): Column {
+    public function offsetGet($name): Column {
         return new Column($this->db, $name, $this->alias);
     }
 
@@ -241,7 +241,7 @@ 
      * @param string $order
      * @return $this
      */
-    public function order (string $order) {
+    public function order(string $order) {
         $this->_order = $order;
         return $this;
     }
@@ -249,7 +249,7 @@ 
     /**
      * @return Statement
      */
-    public function prepare (): Statement {
+    public function prepare(): Statement {
         return $this->db->prepare($this->toSql());
     }
 
@@ -257,7 +257,7 @@ 
      * @param Closure $fetcher
      * @return $this
      */
-    public function setFetcher (Closure $fetcher) {
+    public function setFetcher(Closure $fetcher) {
         $this->fetcher = $fetcher;
         return $this;
     }
@@ -265,7 +265,7 @@ 
     /**
      * @return string
      */
-    public function toSql (): string {
+    public function toSql(): string {
         $sql = SQL::select($this->table, $this->columns);
         foreach ($this->_join as $join) {
             $sql .= " {$join}";
@@ -283,7 +283,7 @@ 
      *
      * @return string
      */
-    public function toSubquery (): string {
+    public function toSubquery(): string {
         return "({$this->toSql()}) AS {$this->alias}";
     }
 
@@ -293,7 +293,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function where (string $condition) {
+    public function where(string $condition) {
         $this->_where[] = $condition;
         return $this;
     }

src/DB/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/Expression.php

Spacing +2 added lines, -2 removed lines

@@ -12,14 +12,14 @@
     /**
      * @param string $string
      */
-    public function __construct (string $string) {
+    public function __construct(string $string) {
         $this->string = $string;
     }
 
     /**
      * @return string
      */
-    public function __toString () {
+    public function __toString() {
         return $this->string;
     }
 }
\ No newline at end of file

src/DB/SQL.php

Spacing +29 added lines, -29 removed lines

@@ -17,7 +17,7 @@ 
      * @param string[] $conditions
      * @return string
      */
-    public static function all (array $conditions): string {
+    public static function all(array $conditions): string {
         if (count($conditions) === 1) {
             return reset($conditions);
         }
@@ -30,7 +30,7 @@ 
      * @param string[] $conditions
      * @return string
      */
-    public static function any (array $conditions): string {
+    public static function any(array $conditions): string {
         if (count($conditions) === 1) {
             return reset($conditions);
         }
@@ -43,7 +43,7 @@ 
      * @param string $column
      * @return ExpressionInterface
      */
-    public static function avg (string $column): ExpressionInterface {
+    public static function avg(string $column): ExpressionInterface {
         return new Expression("AVG({$column})");
     }
 
@@ -79,7 +79,7 @@ 
      * @param string $listOperator
      * @return string|array
      */
-    public static function compare ($a, $operator, $b = null, $subOperator = null, $listOperator = null) {
+    public static function compare($a, $operator, $b = null, $subOperator = null, $listOperator = null) {
         if (is_array($a)) {
             $cmp = [];
             foreach ($a as $k => $v) {
@@ -102,7 +102,7 @@ 
      * @param string $column
      * @return ExpressionInterface
      */
-    public static function count (string $column): ExpressionInterface {
+    public static function count(string $column): ExpressionInterface {
         return new Expression("COUNT({$column})");
     }
 
@@ -113,7 +113,7 @@ 
      * @param array $columns
      * @return string
      */
-    public static function group (array $columns): string {
+    public static function group(array $columns): string {
         if ($columns) {
             return ' GROUP BY ' . implode(',', $columns);
         }
@@ -127,7 +127,7 @@ 
      * @param array $conditions
      * @return string
      */
-    public static function having (array $conditions): string {
+    public static function having(array $conditions): string {
         if ($conditions) {
             return ' HAVING ' . static::all($conditions);
         }
@@ -141,7 +141,7 @@ 
      * @param string|array|Select $b
      * @return string|array
      */
-    public static function isEqual ($a, $b = null) {
+    public static function isEqual($a, $b = null) {
         return static::compare($a, '=', $b, 'ANY', 'IN');
     }
 
@@ -152,7 +152,7 @@ 
      * @param string|Select $b
      * @return string|array
      */
-    public static function isGreater ($a, $b = null) {
+    public static function isGreater($a, $b = null) {
         return static::compare($a, '>', $b, 'ALL');
     }
 
@@ -163,7 +163,7 @@ 
      * @param string|Select $b
      * @return string|array
      */
-    public static function isGreaterOrEqual ($a, $b = null) {
+    public static function isGreaterOrEqual($a, $b = null) {
         return static::compare($a, '>=', $b, 'ALL');
     }
 
@@ -174,7 +174,7 @@ 
      * @param string|Select $b
      * @return string|array
      */
-    public static function isLess ($a, $b = null) {
+    public static function isLess($a, $b = null) {
         return static::compare($a, '<', $b, 'ALL');
     }
 
@@ -185,7 +185,7 @@ 
      * @param string|Select $b
      * @return string|array
      */
-    public static function isLessOrEqual ($a, $b = null) {
+    public static function isLessOrEqual($a, $b = null) {
         return static::compare($a, '<=', $b, 'ALL');
     }
 
@@ -196,7 +196,7 @@ 
      * @param string $pattern
      * @return string|array
      */
-    public static function isLike ($x, string $pattern = null) {
+    public static function isLike($x, string $pattern = null) {
         return static::compare($x, 'LIKE', $pattern);
     }
 
@@ -207,7 +207,7 @@ 
      * @param null|bool $identity
      * @return string|array
      */
-    public static function isNot ($x, $identity) {
+    public static function isNot($x, $identity) {
         return static::compare($x, 'IS NOT', ['' => 'UNKNOWN', 1 => 'TRUE', 0 => 'FALSE'][$identity]);
     }
 
@@ -218,7 +218,7 @@ 
      * @param string|array|Select $b
      * @return string|array
      */
-    public static function isNotEqual ($a, $b = null) {
+    public static function isNotEqual($a, $b = null) {
         return static::compare($a, '<>', $b, 'ALL', 'NOT IN');
     }
 
@@ -229,7 +229,7 @@ 
      * @param string $pattern
      * @return string|array
      */
-    public static function isNotLike ($x, string $pattern = null) {
+    public static function isNotLike($x, string $pattern = null) {
         return static::compare($x, 'NOT LIKE', $pattern);
     }
 
@@ -239,7 +239,7 @@ 
      * @param string|array $x
      * @return string|array
      */
-    public static function isNotNull ($x) {
+    public static function isNotNull($x) {
         if (is_array($x)) {
             return array_map(__METHOD__, $x);
         }
@@ -253,7 +253,7 @@ 
      * @param string $pattern
      * @return string|array
      */
-    public static function isNotRegExp ($x, string $pattern = null) {
+    public static function isNotRegExp($x, string $pattern = null) {
         return static::compare($x, 'NOT REGEXP', $pattern);
     }
 
@@ -264,7 +264,7 @@ 
      * @param string $pattern
      * @return string|array
      */
-    public static function isRegExp ($x, string $pattern = null) {
+    public static function isRegExp($x, string $pattern = null) {
         return static::compare($x, 'REGEXP', $pattern);
     }
 
@@ -276,7 +276,7 @@ 
      * @param int $offset
      * @return string
      */
-    public static function limit (int $limit, int $offset = 0): string {
+    public static function limit(int $limit, int $offset = 0): string {
         if ($limit) {
             $limit = " LIMIT {$limit}";
             if ($offset) {
@@ -293,7 +293,7 @@ 
      * @param int|array|Countable $count
      * @return string[]
      */
-    public static function marks ($count): array {
+    public static function marks($count): array {
         if (is_array($count) or $count instanceof Countable) {
             $count = count($count);
         }
@@ -306,7 +306,7 @@ 
      * @param string $column
      * @return ExpressionInterface
      */
-    public static function max (string $column): ExpressionInterface {
+    public static function max(string $column): ExpressionInterface {
         return new Expression("MAX({$column}");
     }
 
@@ -316,7 +316,7 @@ 
      * @param string $column
      * @return ExpressionInterface
      */
-    public static function min (string $column): ExpressionInterface {
+    public static function min(string $column): ExpressionInterface {
         return new Expression("MIN({$column})");
     }
 
@@ -326,7 +326,7 @@ 
      * @param string|array $x
      * @return string|array
      */
-    public static function not ($x) {
+    public static function not($x) {
         if (is_array($x)) {
             return array_map(__METHOD__, $x);
         }
@@ -340,7 +340,7 @@ 
      * @param string $order
      * @return string
      */
-    public static function order (string $order): string {
+    public static function order(string $order): string {
         if (strlen($order)) {
             return ' ORDER BY ' . $order;
         }
@@ -354,7 +354,7 @@ 
      * @param array $columns String keys are used for aliasing.
      * @return string
      */
-    public static function select (string $table, array $columns): string {
+    public static function select(string $table, array $columns): string {
         $names = [];
         foreach ($columns as $alias => $name) {
             if (is_string($alias) and $alias !== $name) {
@@ -375,7 +375,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[(string)$column] = ':' . str_replace('.', '__', $column);
@@ -390,12 +390,12 @@ 
      * @param array $conditions
      * @return string
      */
-    public static function where (array $conditions): string {
+    public static function where(array $conditions): string {
         if ($conditions) {
             return ' WHERE ' . static::all($conditions);
         }
         return '';
     }
 
-    final private function __construct () { }
+    final private function __construct() { }
 }
\ No newline at end of file

Braces +3 added lines, -6 removed lines

@@ -86,11 +86,9 @@ 
                 $cmp[$k] = static::compare($k, $operator, $v, $subOperator, $listOperator);
             }
             return $cmp;
-        }
-        elseif (is_array($b)) {
+        } elseif (is_array($b)) {
             return "{$a} {$listOperator} (" . implode(',', $b) . ")";
-        }
-        elseif ($b instanceof Select) {
+        } elseif ($b instanceof Select) {
             return "{$a} {$operator} {$subOperator} ({$b->toSql()})";
         }
         return "{$a} {$operator} {$b}";
@@ -359,8 +357,7 @@ 
         foreach ($columns as $alias => $name) {
             if (is_string($alias) and $alias !== $name) {
                 $names[] = $name . ' AS ' . $alias;
-            }
-            else {
+            } else {
                 $names[] = $name;
             }
         }

src/DB.php

Spacing +16 added lines, -16 removed lines

@@ -47,7 +47,7 @@ 
      * @param string $passwd
      * @param array $options
      */
-    public function __construct ($dsn, $username = null, $passwd = null, $options = null) {
+    public function __construct($dsn, $username = null, $passwd = null, $options = null) {
         parent::__construct(...func_get_args());
         $this->setAttribute(self::ATTR_DEFAULT_FETCH_MODE, self::FETCH_ASSOC);
         $this->setAttribute(self::ATTR_EMULATE_PREPARES, false);
@@ -63,7 +63,7 @@ 
      * @param string $sql
      * @return int
      */
-    public function exec ($sql): int {
+    public function exec($sql): int {
         $this->logger->__invoke($sql);
         return parent::exec($sql);
     }
@@ -73,7 +73,7 @@ 
      *
      * @return string
      */
-    final public function getDriver (): string {
+    final public function getDriver(): string {
         return $this->getAttribute(self::ATTR_DRIVER_NAME);
     }
 
@@ -83,7 +83,7 @@ 
      * @param string $interface
      * @return Junction
      */
-    public function getJunction ($interface): Junction {
+    public function getJunction($interface): Junction {
         if (!isset($this->junctions[$interface])) {
             $this->junctions[$interface] = new Junction($this, $interface);
         }
@@ -93,7 +93,7 @@ 
     /**
      * @return Closure
      */
-    public function getLogger (): Closure {
+    public function getLogger(): Closure {
         return $this->logger;
     }
 
@@ -103,7 +103,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public function getRecord ($class): Record {
+    public function getRecord($class): Record {
         if (is_object($class)) {
             $class = get_class($class);
         }
@@ -135,7 +135,7 @@ 
      * @param string|array|Select|Closure $b
      * @return string|string[] Same type as `$a`, keys are not preserved.
      */
-    public function match ($a, $b = null) {
+    public function match($a, $b = null) {
         if (is_array($a)) {
             return array_map([$this, __FUNCTION__], array_keys($a), $a);
         }
@@ -152,7 +152,7 @@ 
      * @param string $access Class or interface name.
      * @return bool
      */
-    public function offsetExists ($access): bool {
+    public function offsetExists($access): bool {
         return (bool)$this->offsetGet($access);
     }
 
@@ -160,7 +160,7 @@ 
      * @param string $access Class or interface name.
      * @return Record|Junction|null
      */
-    public function offsetGet ($access) {
+    public function offsetGet($access) {
         if (class_exists($access)) {
             return $this->getRecord($access);
         }
@@ -177,7 +177,7 @@ 
      * @param void $value
      * @throws Exception
      */
-    final public function offsetSet ($access, $value): void {
+    final public function offsetSet($access, $value): void {
         throw new Exception('The schema is immutable.');
     }
 
@@ -187,7 +187,7 @@ 
      * @param void $access
      * @throws Exception
      */
-    final public function offsetUnset ($access): void {
+    final public function offsetUnset($access): void {
         $this->offsetSet($access, null);
     }
 
@@ -198,7 +198,7 @@ 
      * @param array $options
      * @return Statement
      */
-    public function prepare ($sql, $options = null): Statement {
+    public function prepare($sql, $options = null): Statement {
         $this->logger->__invoke($sql);
         /** @var Statement $statement */
         $statement = parent::prepare(...func_get_args());
@@ -214,7 +214,7 @@ 
      * @param array $ctorargs
      * @return Statement
      */
-    public function query ($sql, $mode = PDO::ATTR_DEFAULT_FETCH_MODE, $arg3 = null, array $ctorargs = []): Statement {
+    public function query($sql, $mode = PDO::ATTR_DEFAULT_FETCH_MODE, $arg3 = null, array $ctorargs = []): Statement {
         $this->logger->__invoke($sql);
         /** @var Statement $statement */
         $statement = parent::query(...func_get_args());
@@ -234,7 +234,7 @@ 
      * @param int $type Ignored.
      * @return mixed
      */
-    public function quote ($value, $type = null) {
+    public function quote($value, $type = null) {
         if ($value instanceof ExpressionInterface) {
             return $value;
         }
@@ -256,7 +256,7 @@ 
      * @param EntityInterface $entity
      * @return int ID
      */
-    public function save (EntityInterface $entity): int {
+    public function save(EntityInterface $entity): int {
         return $this->getRecord($entity)->save($entity);
     }
 
@@ -264,7 +264,7 @@ 
      * @param Closure $logger
      * @return $this
      */
-    public function setLogger (Closure $logger) {
+    public function setLogger(Closure $logger) {
         $this->logger = $logger;
         return $this;
     }