hfw / db

src/DB/SQL/Expression.php

Spacing +2 added lines, -2 removed lines

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

src/DB/SQL/ComparisonTrait.php

Spacing +12 added lines, -12 removed lines

@@ -26,7 +26,7 @@ 
      * @param null|bool|string|Select $arg
      * @return Predicate
      */
-    public function is ($arg): Predicate {
+    public function is($arg): Predicate {
         if ($arg === null or is_bool($arg)) {
             $arg = ['' => 'NULL', 1 => 'TRUE', 0 => 'FALSE'][$arg];
         }
@@ -43,7 +43,7 @@ 
      * @param string|array|Select $arg
      * @return Predicate
      */
-    public function isEqual ($arg) {
+    public function isEqual($arg) {
         return Predicate::compare($this, $this->db->quoteMixed($arg));
     }
 
@@ -53,7 +53,7 @@ 
      * @param string|Select $arg
      * @return Predicate
      */
-    public function isGreater ($arg) {
+    public function isGreater($arg) {
         return Predicate::compare($this, $this->db->quote($arg), '>', 'ALL');
     }
 
@@ -63,7 +63,7 @@ 
      * @param string|Select $arg
      * @return Predicate
      */
-    public function isGreaterOrEqual ($arg) {
+    public function isGreaterOrEqual($arg) {
         return Predicate::compare($this, $this->db->quote($arg), '>=', 'ALL');
     }
 
@@ -73,7 +73,7 @@ 
      * @param string|Select $arg
      * @return Predicate
      */
-    public function isLess ($arg) {
+    public function isLess($arg) {
         return Predicate::compare($this, $this->db->quote($arg), '<', 'ALL');
     }
 
@@ -83,7 +83,7 @@ 
      * @param string|Select $arg
      * @return Predicate
      */
-    public function isLessOrEqual ($arg) {
+    public function isLessOrEqual($arg) {
         return Predicate::compare($this, $this->db->quote($arg), '<=', 'ALL');
     }
 
@@ -93,7 +93,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isLike (string $pattern) {
+    public function isLike(string $pattern) {
         return Predicate::compare($this, $this->db->quote($pattern), 'LIKE');
     }
 
@@ -103,7 +103,7 @@ 
      * @param null|bool|string|Select $arg
      * @return Predicate
      */
-    public function isNot ($arg) {
+    public function isNot($arg) {
         return $this->is($arg)->invert();
     }
 
@@ -113,7 +113,7 @@ 
      * @param string|array|Select $arg
      * @return Predicate
      */
-    public function isNotEqual ($arg) {
+    public function isNotEqual($arg) {
         return Predicate::compare($this, $this->db->quoteMixed($arg), '<>', 'ALL', 'NOT IN');
     }
 
@@ -123,7 +123,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isNotLike (string $pattern) {
+    public function isNotLike(string $pattern) {
         return Predicate::compare($this, $this->db->quote($pattern), 'NOT LIKE');
     }
 
@@ -133,7 +133,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isNotRegExp (string $pattern) {
+    public function isNotRegExp(string $pattern) {
         return Predicate::compare($this, $this->db->quote($pattern), 'NOT REGEXP');
     }
 
@@ -143,7 +143,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isRegExp (string $pattern) {
+    public function isRegExp(string $pattern) {
         return Predicate::compare($this, $this->db->quote($pattern), 'REGEXP');
     }
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -29,8 +29,7 @@
     public function is ($arg): Predicate {
         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'][$this->db->getDriver()];

src/DB/SQL/TextTrait.php

Spacing +8 added lines, -8 removed lines

@@ -17,7 +17,7 @@ 
     /**
      * @return Text
      */
-    public function getHex () {
+    public function getHex() {
         return new Text($this->db, "HEX({$this})");
     }
 
@@ -28,7 +28,7 @@ 
      *
      * @return Numeric
      */
-    public function getLength () {
+    public function getLength() {
         switch ($this->db->getDriver()) {
             case 'sqlite':
                 return new Numeric($this->db, "LENGTH(CAST({$this} AS TEXT))");
@@ -42,7 +42,7 @@ 
      *
      * @return Text
      */
-    public function getLower () {
+    public function getLower() {
         return new Text($this->db, "LOWER({$this})");
     }
 
@@ -54,7 +54,7 @@ 
      * @param string $substring
      * @return Numeric
      */
-    public function getPosition (string $substring) {
+    public function getPosition(string $substring) {
         $substring = $this->db->quote($substring);
         switch ($this->db->getDriver()) {
             case 'sqlite':
@@ -71,7 +71,7 @@ 
      * @param string $replace
      * @return Text
      */
-    public function getReplacement (string $search, string $replace) {
+    public function getReplacement(string $search, string $replace) {
         $search = $this->db->quote($search);
         $replace = $this->db->quote($replace);
         return new Text($this->db, "REPLACE({$this},{$search},{$replace})");
@@ -82,7 +82,7 @@ 
      *
      * @return Numeric
      */
-    public function getSize () {
+    public function getSize() {
         switch ($this->db->getDriver()) {
             case 'sqlite':
                 return new Numeric($this->db, "LENGTH(CAST({$this} AS BLOB))");
@@ -98,7 +98,7 @@ 
      * @param int $length
      * @return Text
      */
-    public function getSubstring (int $start, int $length = null) {
+    public function getSubstring(int $start, int $length = null) {
         if (isset($length)) {
             return new Text($this->db, "SUBSTR({$this},{$start},{$length})");
         }
@@ -110,7 +110,7 @@ 
      *
      * @return Text
      */
-    public function getUpper () {
+    public function getUpper() {
         return new Text($this->db, "UPPER({$this})");
     }
 }
\ No newline at end of file

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();
@@ -97,7 +97,7 @@ 
     /**
      * Gives the clone a new alias.
      */
-    public function __clone () {
+    public function __clone() {
         $this->alias = uniqid('_') . "__{$this->table}";
     }
 
@@ -105,7 +105,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function __invoke (array $args = []): Statement {
+    public function __invoke(array $args = []): Statement {
         return $this->execute($args);
     }
 
@@ -114,7 +114,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->alias;
     }
 
@@ -124,7 +124,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();
@@ -136,7 +136,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function execute (array $args = []): Statement {
+    public function execute(array $args = []): Statement {
         if (!empty($args)) {
             return $this->prepare()->__invoke($args);
         }
@@ -151,7 +151,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)));
     }
 
@@ -164,7 +164,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));
     }
 
@@ -175,7 +175,7 @@ 
      *
      * @return Generator
      */
-    public function getIterator () {
+    public function getIterator() {
         yield from $this->fetchEach();
     }
 
@@ -185,7 +185,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}";
         }
@@ -201,7 +201,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function having (string $condition) {
+    public function having(string $condition) {
         if (!strlen($this->_having)) {
             $this->_having = " HAVING {$condition}";
         }
@@ -219,7 +219,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();
         }
@@ -234,7 +234,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 = '';
         }
@@ -253,7 +253,7 @@ 
      * @param string $name Name or alias if used.
      * @return bool
      */
-    public function offsetExists ($name): bool {
+    public function offsetExists($name): bool {
         return true;
     }
 
@@ -263,7 +263,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);
     }
 
@@ -273,7 +273,7 @@ 
      * @param string $order
      * @return $this
      */
-    public function order (string $order) {
+    public function order(string $order) {
         if (strlen($order)) {
             $order = " ORDER BY {$order}";
         }
@@ -284,7 +284,7 @@ 
     /**
      * @return Statement
      */
-    public function prepare (): Statement {
+    public function prepare(): Statement {
         return $this->db->prepare($this->toSql());
     }
 
@@ -292,7 +292,7 @@ 
      * @param Closure $fetcher
      * @return $this
      */
-    public function setFetcher (Closure $fetcher) {
+    public function setFetcher(Closure $fetcher) {
         $this->fetcher = $fetcher;
         return $this;
     }
@@ -300,7 +300,7 @@ 
     /**
      * @return string
      */
-    public function toSql (): string {
+    public function toSql(): string {
         $sql = "SELECT {$this->_columns} FROM {$this->table}";
         $sql .= $this->_join;
         $sql .= $this->_where;
@@ -316,7 +316,7 @@ 
      *
      * @return string
      */
-    public function toSubquery (): string {
+    public function toSubquery(): string {
         return "({$this->toSql()}) AS {$this->alias}";
     }
 
@@ -326,7 +326,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.php

Spacing +19 added lines, -19 removed lines

@@ -53,7 +53,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($dsn, $username, $passwd, $options);
         $this->driver = $this->getAttribute(self::ATTR_DRIVER_NAME);
         $this->setAttribute(self::ATTR_DEFAULT_FETCH_MODE, self::FETCH_ASSOC);
@@ -74,7 +74,7 @@ 
      * @param string $sql
      * @return int
      */
-    public function exec ($sql): int {
+    public function exec($sql): int {
         $this->logger->__invoke($sql);
         return parent::exec($sql);
     }
@@ -82,7 +82,7 @@ 
     /**
      * @return string
      */
-    final public function getDriver (): string {
+    final public function getDriver(): string {
         return $this->driver;
     }
 
@@ -92,7 +92,7 @@ 
      * @param string $interface
      * @return Junction
      */
-    public function getJunction ($interface): Junction {
+    public function getJunction($interface): Junction {
         if (!isset($this->junctions[$interface])) {
             $this->junctions[$interface] = Junction::fromInterface($this, $interface);
         }
@@ -102,7 +102,7 @@ 
     /**
      * @return Closure
      */
-    public function getLogger (): Closure {
+    public function getLogger(): Closure {
         return $this->logger;
     }
 
@@ -112,7 +112,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public function getRecord ($class): Record {
+    public function getRecord($class): Record {
         $name = $class;
         if (is_object($name)) {
             $name = get_class($name);
@@ -137,7 +137,7 @@ 
      * @param mixed $b
      * @return string
      */
-    public function match ($a, $b) {
+    public function match($a, $b) {
         if ($b instanceof Closure) {
             if (!$a instanceof Column) {
                 $a = new Column($this, $a);
@@ -163,7 +163,7 @@ 
      * @param array $match
      * @return string[]
      */
-    public function matchArray (array $match) {
+    public function matchArray(array $match) {
         return array_map([$this, 'match'], array_keys($match), $match);
     }
 
@@ -171,7 +171,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);
     }
 
@@ -179,7 +179,7 @@ 
      * @param string $access Class or interface name.
      * @return null|Record|Junction
      */
-    public function offsetGet ($access) {
+    public function offsetGet($access) {
         if (class_exists($access)) {
             return $this->getRecord($access);
         }
@@ -196,7 +196,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.');
     }
 
@@ -206,7 +206,7 @@ 
      * @param void $access
      * @throws Exception
      */
-    final public function offsetUnset ($access): void {
+    final public function offsetUnset($access): void {
         $this->offsetSet($access, null);
     }
 
@@ -217,7 +217,7 @@ 
      * @param array $options
      * @return Statement
      */
-    public function prepare ($sql, $options = []): Statement {
+    public function prepare($sql, $options = []): Statement {
         $this->logger->__invoke($sql);
         /** @var Statement $statement */
         $statement = parent::prepare($sql, $options);
@@ -233,7 +233,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());
@@ -252,7 +252,7 @@ 
      * @param int $type Ignored.
      * @return string
      */
-    public function quote ($value, $type = null) {
+    public function quote($value, $type = null) {
         if ($value instanceof ExpressionInterface) {
             return $value;
         }
@@ -272,7 +272,7 @@ 
      * @param array $values
      * @return array
      */
-    public function quoteArray (array $values): array {
+    public function quoteArray(array $values): array {
         return array_map([$this, 'quote'], $values);
     }
 
@@ -282,7 +282,7 @@ 
      * @param mixed $value
      * @return array|string
      */
-    public function quoteMixed ($value) {
+    public function quoteMixed($value) {
         if (is_array($value)) {
             return $this->quoteArray($value);
         }
@@ -295,7 +295,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);
     }
 
@@ -303,7 +303,7 @@ 
      * @param Closure $logger
      * @return $this
      */
-    public function setLogger (Closure $logger) {
+    public function setLogger(Closure $logger) {
         $this->logger = $logger;
         return $this;
     }