tsukasa-mixer / QueryBuilder

src/BaseAdapter.php

Braces +5 added lines, -10 removed lines

@@ -806,8 +806,7 @@ 
                 if (!is_numeric($column)) {
                     $value .= ' AS ' . $this->quoteColumn($column);
                 }
-            }
-            else {
+            } else {
                 $subQuery = $this->quoteSql($expr);
 
                 if (is_numeric($column)) {
@@ -818,12 +817,10 @@ 
                 if (!empty($subQuery)) {
                     if (strpos($subQuery, 'SELECT') !== false) {
                         $value = '(' . $subQuery . ') AS ' . $this->quoteColumn($column);
-                    }
-                    else {
+                    } else {
                         $value = $this->quoteColumn($subQuery) . ' AS ' . $this->quoteColumn($column);
                     }
-                }
-                else if (strpos($column, ',') === false && strpos($column, 'AS') !== false) {
+                } else if (strpos($column, ',') === false && strpos($column, 'AS') !== false) {
 
                     list($rawColumn, $rawAlias) = explode('AS', $column);
                     $value = $this->quoteColumn(trim($rawColumn));
@@ -831,8 +828,7 @@ 
                     if (!empty($rawAlias)) {
                         $value .= ' AS ' . $this->quoteColumn(trim($rawAlias));
                     }
-                }
-                else if (strpos($column, ',') !== false) {
+                } else if (strpos($column, ',') !== false) {
                     $newSelect = [];
 
                     foreach (explode(',', $column) as $item) {
@@ -853,8 +849,7 @@ 
                     }
                     $value = implode(', ', $newSelect);
 
-                }
-                else {
+                } else {
                     $value = $this->quoteColumn($column);
                 }
             }

src/QueryBuilder.php

Braces +1 added lines, -2 removed lines

@@ -1120,8 +1120,7 @@
             foreach ($this->_order as $column) {
                 if ($column instanceof Expression) {
                     $order[$column->toSQL()] = '';
-                }
-                else if ($column === '?') {
+                } else if ($column === '?') {
                     $order[] = $this->getAdapter()->getRandomOrder();
                 } else {
                     list($newColumn, $direction) = $this->buildOrderJoin($column);