hfw / db

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

Spacing +20 added lines, -20 removed lines

@@ -76,7 +76,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();
@@ -99,7 +99,7 @@ 
     /**
      * Gives the clone a new alias.
      */
-    public function __clone () {
+    public function __clone() {
         $this->alias = uniqid('_') . "__{$this->table}";
     }
 
@@ -107,7 +107,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function __invoke (array $args = []): Statement {
+    public function __invoke(array $args = []): Statement {
         return $this->execute($args);
     }
 
@@ -116,7 +116,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->alias;
     }
 
@@ -126,7 +126,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();
@@ -138,7 +138,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function execute (array $args = []): Statement {
+    public function execute(array $args = []): Statement {
         if (!empty($args)) {
             return $this->prepare()($args);
         }
@@ -153,7 +153,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));
     }
 
@@ -164,7 +164,7 @@ 
      *
      * @return ArrayIterator
      */
-    public function getIterator () {
+    public function getIterator() {
         return new ArrayIterator($this->fetchAll());
     }
 
@@ -174,7 +174,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}";
         }
@@ -190,7 +190,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function having (string $condition) {
+    public function having(string $condition) {
         $this->_having[] = $condition;
         return $this;
     }
@@ -203,7 +203,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();
         }
@@ -218,7 +218,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 = '';
         }
@@ -237,7 +237,7 @@ 
      * @param string $name Name or alias if used.
      * @return bool
      */
-    public function offsetExists ($name): bool {
+    public function offsetExists($name): bool {
         return true;
     }
 
@@ -247,7 +247,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);
     }
 
@@ -257,7 +257,7 @@ 
      * @param string $order
      * @return $this
      */
-    public function order (string $order) {
+    public function order(string $order) {
         if (strlen($order)) {
             $order = " ORDER BY {$order}";
         }
@@ -268,7 +268,7 @@ 
     /**
      * @return Statement
      */
-    public function prepare (): Statement {
+    public function prepare(): Statement {
         return $this->db->prepare($this->toSql());
     }
 
@@ -276,7 +276,7 @@ 
      * @param Closure $fetcher
      * @return $this
      */
-    public function setFetcher (Closure $fetcher) {
+    public function setFetcher(Closure $fetcher) {
         $this->fetcher = $fetcher;
         return $this;
     }
@@ -284,7 +284,7 @@ 
     /**
      * @return string
      */
-    public function toSql (): string {
+    public function toSql(): string {
         $sql = 'SELECT ' . implode(', ', $this->columns) . ' FROM ' . $this->table;
         $sql .= $this->_join;
         if (!empty($this->_where)) {
@@ -304,7 +304,7 @@ 
      *
      * @return string
      */
-    public function toSubquery (): string {
+    public function toSubquery(): string {
         return "({$this->toSql()}) AS {$this->alias}";
     }
 
@@ -314,7 +314,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function where (string $condition) {
+    public function where(string $condition) {
         $this->_where[] = $condition;
         return $this;
     }

Braces +3 added lines, -6 removed lines

@@ -86,8 +86,7 @@ 
         foreach ($columns as $alias => $name) {
             if (is_string($alias) and $name !== $alias) {
                 $this->columns[] = "{$name} AS {$alias}";
-            }
-            else {
+            } else {
                 $this->columns[] = $name;
             }
         }
@@ -177,8 +176,7 @@ 
     public function group (string $column) {
         if (!strlen($this->_group)) {
             $this->_group = " GROUP BY {$column}";
-        }
-        else {
+        } else {
             $this->_group .= ", {$column}";
         }
         return $this;
@@ -221,8 +219,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}";