tsukasa-mixer / QueryBuilder

src/BaseLookupCollection.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 
             case 'in':
                 if (is_array($value)) {
-                    $quotedValues = array_map(function ($item) use ($adapter) {
+                    $quotedValues = array_map(function($item) use ($adapter) {
                         return $adapter->quoteValue($item);
                     }, $value);
                     $sqlValue = implode(', ', $quotedValues);

Braces +10 added lines, -5 removed lines

@@ -39,11 +39,14 @@ 
 
                 if ($value instanceof Expression) {
                     $sqlValue = $value->toSQL();
-                } else if ($value instanceof QueryBuilder) {
+                }
+                else if ($value instanceof QueryBuilder) {
                     $sqlValue = '(' . $value->toSQL() . ')';
-                } else if (strpos($value, 'SELECT') !== false) {
+                }
+                else if (strpos($value, 'SELECT') !== false) {
                     $sqlValue = '(' . $value . ')';
-                } else {
+                }
+                else {
                     $sqlValue = $adapter->quoteValue($value);
                 }
                 return $adapter->quoteColumn($column) . '=' . $sqlValue;
@@ -110,9 +113,11 @@ 
                         return $adapter->quoteValue($item);
                     }, $value);
                     $sqlValue = implode(', ', $quotedValues);
-                } else if ($value instanceof QueryBuilder) {
+                }
+                else if ($value instanceof QueryBuilder) {
                     $sqlValue = $value->toSQL();
-                } else {
+                }
+                else {
                     $sqlValue = $adapter->quoteSql($value);
                 }
                 return $adapter->quoteColumn($column) . ' IN (' . $sqlValue . ')';

src/BaseAdapter.php

Spacing +7 added lines, -7 removed lines

@@ -108,7 +108,7 @@ 
     public function setDriver($driver)
     {
         if (!($driver instanceof \PDO || $driver instanceof Connection)) {
-            throw new QBException('Drive must be instance PDO or '. Connection::class);
+            throw new QBException('Drive must be instance PDO or ' . Connection::class);
         }
 
         $this->driver = $driver;
@@ -340,7 +340,7 @@ 
                 $values[] = '(' . implode(', ', $record) . ')';
             }
 
-            $sql = 'INSERT'. $options .' INTO ' . $this->quoteTableName($tableName) . ' (' . implode(', ', $columns) . ') VALUES ' . implode(', ', $values);
+            $sql = 'INSERT' . $options . ' INTO ' . $this->quoteTableName($tableName) . ' (' . implode(', ', $columns) . ') VALUES ' . implode(', ', $values);
 
             return $this->quoteSql($sql);
         }
@@ -348,7 +348,7 @@ 
         $values = array_map([$this, 'quoteValue'], $rows);
         $columns = array_map([$this, 'quoteColumn'], array_keys($rows));
 
-        $sql = 'INSERT'. $options .' INTO ' . $this->quoteTableName($tableName) . ' (' . implode(', ', $columns) . ') VALUES (' . implode(', ', $values) . ')';
+        $sql = 'INSERT' . $options . ' INTO ' . $this->quoteTableName($tableName) . ' (' . implode(', ', $columns) . ') VALUES (' . implode(', ', $values) . ')';
 
         return $this->quoteSql($sql);
     }
@@ -364,7 +364,7 @@ 
             $options = " {$options} ";
         }
 
-        return 'UPDATE '. $options . $this->quoteTableName($tableName) . ' SET ' . implode(', ', $parts);
+        return 'UPDATE ' . $options . $this->quoteTableName($tableName) . ' SET ' . implode(', ', $parts);
     }
 
     /**
@@ -629,12 +629,12 @@ 
         $toSql = [$joinType];
         if (is_string($tableName) && $tableName = $this->getRawTableName($tableName)) {
             if (strpos($tableName, 'SELECT') !== false) {
-                $toSql[] = '(' . $this->quoteSql($tableName) . ')' ;
+                $toSql[] = '(' . $this->quoteSql($tableName) . ')';
             } else {
-                $toSql[]  = $this->quoteTableName($tableName);
+                $toSql[] = $this->quoteTableName($tableName);
             }
         } else if ($tableName instanceof QueryBuilder) {
-            $toSql[] =  '(' . $this->quoteSql($tableName->toSQL()) . ')' ;
+            $toSql[] = '(' . $this->quoteSql($tableName->toSQL()) . ')';
         } else {
             throw new QBException('Incorrect table name');
         }

Braces +42 added lines, -21 removed lines

@@ -55,7 +55,8 @@ 
         if (($pos = strrpos($name, '.')) !== false) {
             $prefix = $this->quoteTableName(substr($name, 0, $pos)) . '.';
             $name = substr($name, $pos + 1);
-        } else {
+        }
+        else {
             $prefix = '';
         }
         return $prefix . $this->quoteSimpleColumnName($name);
@@ -133,13 +134,17 @@ 
     {
         if ($value instanceof IToSql) {
             return $value->toSql();
-        } else if ($value === true || strtolower($value) === 'true') {
+        }
+        else if ($value === true || strtolower($value) === 'true') {
             return 'TRUE';
-        } else if ($value === false || strtolower($value) === 'false') {
+        }
+        else if ($value === false || strtolower($value) === 'false') {
             return 'FALSE';
-        } else if ($value === null || strtolower($value) === 'null') {
+        }
+        else if ($value === null || strtolower($value) === 'null') {
             return 'NULL';
-        } else if (is_string($value) && $driver = $this->getDriver()) {
+        }
+        else if (is_string($value) && $driver = $this->getDriver()) {
             return $driver->quote($value);
         }
 
@@ -213,7 +218,8 @@ 
     {
         if ($rawValue === true || $rawValue === false || $rawValue === 'true' || $rawValue === 'false') {
             return $this->getBoolean($rawValue);
-        } else if ($rawValue === 'null' || $rawValue === null) {
+        }
+        else if ($rawValue === 'null' || $rawValue === null) {
             return 'NULL';
         }
         return $rawValue;
@@ -267,7 +273,8 @@ 
         foreach ($columns as $i => $column) {
             if ($column instanceof Expression) {
                 $columns[$i] = $column->toSQL();
-            } else if (strpos($column, '(') === false) {
+            }
+            else if (strpos($column, '(') === false) {
                 $columns[$i] = $this->quoteColumn($column);
             }
         }
@@ -417,12 +424,14 @@ 
             foreach ($columns as $name => $type) {
                 if (is_string($name)) {
                     $cols[] = "\t" . $this->quoteColumn($name) . ' ' . $type;
-                } else {
+                }
+                else {
                     $cols[] = "\t" . $type;
                 }
             }
             $sql = ($ifNotExists ? "CREATE TABLE IF NOT EXISTS " : "CREATE TABLE ") . $this->quoteTableName($tableName) . " (\n" . implode(",\n", $cols) . "\n)";
-        } else {
+        }
+        else {
             $sql = ($ifNotExists ? "CREATE TABLE IF NOT EXISTS " : "CREATE TABLE ") . $this->quoteTableName($tableName) . " " . $this->quoteSql($columns);
         }
         return empty($options) ? $sql : $sql . ' ' . $options;
@@ -472,11 +481,14 @@ 
     {
         if ($value === 'true' || $value === true) {
             return 'TRUE';
-        } else if ($value === null || $value === 'null') {
+        }
+        else if ($value === null || $value === 'null') {
             return 'NULL';
-        } else if ($value === false || $value === 'false') {
+        }
+        else if ($value === false || $value === 'false') {
             return 'FALSE';
-        } else {
+        }
+        else {
             return $value;
         }
     }
@@ -604,12 +616,14 @@ 
         foreach ($tables as $tableAlias => $table) {
             if ($table instanceof QueryBuilder) {
                 $tableRaw = $table->toSQL();
-            } else {
+            }
+            else {
                 $tableRaw = $this->getRawTableName($table);
             }
             if (strpos($tableRaw, 'SELECT') !== false) {
                 $quotedTableNames[] = '(' . $tableRaw . ')' . (is_numeric($tableAlias) ? '' : ' AS ' . $this->quoteTableName($tableAlias));
-            } else {
+            }
+            else {
                 $quotedTableNames[] = $this->quoteTableName($tableRaw) . (is_numeric($tableAlias) ? '' : ' AS ' . $this->quoteTableName($tableAlias));
             }
         }
@@ -630,12 +644,15 @@ 
         if (is_string($tableName) && $tableName = $this->getRawTableName($tableName)) {
             if (strpos($tableName, 'SELECT') !== false) {
                 $toSql[] = '(' . $this->quoteSql($tableName) . ')' ;
-            } else {
+            }
+            else {
                 $toSql[]  = $this->quoteTableName($tableName);
             }
-        } else if ($tableName instanceof QueryBuilder) {
+        }
+        else if ($tableName instanceof QueryBuilder) {
             $toSql[] =  '(' . $this->quoteSql($tableName->toSQL()) . ')' ;
-        } else {
+        }
+        else {
             throw new QBException('Incorrect table name');
         }
 
@@ -647,11 +664,13 @@ 
             $onSQL = [];
             if (is_string($on)) {
                 $onSQL[] = $this->quoteSql($on);
-            } else {
+            }
+            else {
                 foreach ($on as $leftColumn => $rightColumn) {
                     if ($rightColumn instanceof Expression) {
                         $onSQL[] = $this->quoteColumn($leftColumn) . '=' . $this->quoteSql($rightColumn->toSQL());
-                    } else {
+                    }
+                    else {
                         $onSQL[] = $this->quoteColumn($leftColumn) . '=' . $this->quoteColumn($rightColumn);
                     }
                 }
@@ -691,7 +710,8 @@ 
             $sql = $having
                 ->setQb($queryBuilder)
                 ->toSql();
-        } else {
+        }
+        else {
             $sql = $this->quoteSql($having);
         }
 
@@ -711,7 +731,8 @@ 
 
         if ($union instanceof QueryBuilder) {
             $unionSQL = $union->setOrder(null)->toSQL();
-        } else {
+        }
+        else {
             $unionSQL = $this->quoteSql($union);
         }
         return ($all ? 'UNION ALL' : 'UNION') . ' (' . $unionSQL . ')';

src/Expression/Expression.php

Spacing +2 added lines, -2 removed lines

@@ -50,10 +50,10 @@
         if (strpos($sql, '?'))
         {
             if (mb_substr_count($sql, '?') !== count($this->params)) {
-                throw new QBException('Incorrect parameters count in Expression: "'.addslashes($this->expression).'"');
+                throw new QBException('Incorrect parameters count in Expression: "' . addslashes($this->expression) . '"');
             }
 
-            $sql = preg_replace_callback('~\?~', function ($matches) {
+            $sql = preg_replace_callback('~\?~', function($matches) {
                 return $this->qb->getAdapter()->quoteValue(
                     $this->getNextParam()
                 );

src/QueryBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -823,7 +823,7 @@ 
 
     public function generateDeleteSql()
     {
-        $options = $this->_queryOptions ;
+        $options = $this->_queryOptions;
         if ($options) {
             $options = " {$options} ";
         }
@@ -980,7 +980,7 @@ 
         $tableName = $this->getAdapter()->getRawTableName($table);
 
         if (strpos($tableName, '.') !== false) {
-            $tableName = substr($tableName, strpos($tableName, '.')+1);
+            $tableName = substr($tableName, strpos($tableName, '.') + 1);
         }
 
         return strtr('{table}_{count}', [

Braces +62 added lines, -31 removed lines

@@ -189,7 +189,8 @@ 
         $types = [static::TYPE_INSERT, static::TYPE_UPDATE, static::TYPE_DELETE, static::TYPE_SELECT];
         if (in_array($type, $types, true)) {
             $this->_type = $type;
-        } else {
+        }
+        else {
             throw new QBException('Incorrect type');
         }
 
@@ -261,12 +262,15 @@ 
         if ($newSelect === false) {
             if ($tableAlias === null || $rawColumn === '*') {
                 $columns = $rawColumn;
-            } elseif (strpos($rawColumn, '.') !== false) {
+            }
+            elseif (strpos($rawColumn, '.') !== false) {
                 $columns = $rawColumn;
-            } else {
+            }
+            else {
                 $columns = $tableAlias . '.' . $rawColumn;
             }
-        } else {
+        }
+        else {
             list($alias, $joinColumn) = $newSelect;
             $columns = $alias . '.' . $joinColumn;
         }
@@ -292,17 +296,21 @@ 
             foreach ($this->_select as $alias => $column) {
                 if ($column instanceof Aggregation) {
                     $select[$alias] = $this->buildSelectFromAggregation($column);
-                } else if (is_string($column)) {
+                }
+                else if (is_string($column)) {
                     if (strpos($column, 'SELECT') !== false) {
                         $select[$alias] = $column;
-                    } else {
+                    }
+                    else {
                         $select[$alias] = $this->addColumnAlias($builder->fetchColumnName($column));
                     }
-                } else {
+                }
+                else {
                     $select[$alias] = $column;
                 }
             }
-        } else if (is_string($this->_select)) {
+        }
+        else if (is_string($this->_select)) {
             $select = $this->addColumnAlias($this->_select);
         }
         return $this->getAdapter()->sqlSelect($select, $this->_queryOptions);
@@ -322,7 +330,8 @@ 
 
         if ($alias) {
             $this->_select[$alias] = $select;
-        } else {
+        }
+        else {
             $this->_select[] = $select;
         }
 
@@ -339,9 +348,11 @@ 
         if (is_string($select) && $newSelect = $this->getLookupBuilder()->buildJoin($this, $select)) {
             list($t_alias, $column) = $newSelect;
             $this->pushToSelect($t_alias . '.' . $column, $alias);
-        } else if ($select instanceof IToSql) {
+        }
+        else if ($select instanceof IToSql) {
             $this->pushToSelect($select->setQb($this), $alias);
-        } else {
+        }
+        else {
             $this->pushToSelect($select, $alias);
         }
 
@@ -364,7 +375,8 @@ 
             foreach ($select as $key => $part) {
                 $this->addSelect($part, $key);
             }
-        } else {
+        }
+        else {
             $this->addSelect($select);
         }
 
@@ -478,10 +490,12 @@ 
     {
         if ($tableName instanceof QueryBuilder) {
             $this->_join[] = $this->getAdapter()->sqlJoin($joinType, $tableName, $on, $alias, $index);
-        } else {
+        }
+        else {
             if ($joinType === 'RAW' && !empty($tableName)) {
                 $join = $this->getAdapter()->quoteSql($tableName);
-            } else {
+            }
+            else {
                 $join = $this->getAdapter()->sqlJoin($joinType, $tableName, $on, $alias);
             }
 
@@ -553,7 +567,8 @@ 
             foreach ($columns as $column) {
                 $this->addOrder($column);
             }
-        } else {
+        }
+        else {
             $this->addOrder($columns);
         }
 
@@ -587,11 +602,13 @@ 
                     }
 
                     $this->_order[] = $_column;
-                } else {
+                }
+                else {
                     $this->_order[] = current($temp);
                 }
             }
-        } else {
+        }
+        else {
             $this->_order[] = $column;
         }
 
@@ -680,14 +697,18 @@ 
                 if (is_numeric($key)) {
                     if ($value instanceof IToSql) {
                         $parts[] = $this->parseCondition($value, $operator);
-                    } elseif ($value instanceof QueryBuilder) {
+                    }
+                    elseif ($value instanceof QueryBuilder) {
                         $parts[] = $this->parseCondition($value, $operator);
-                    } else if (is_array($value)) {
+                    }
+                    else if (is_array($value)) {
                         $parts[] = $this->parseCondition($value, $operator);
-                    } else if (is_string($value)) {
+                    }
+                    else if (is_string($value)) {
                         $parts[] = $value;
                     }
-                } else {
+                }
+                else {
                     $tableAlias = $this->getAlias();
                     $value = $this->getAdapter()->prepareValue($value);
 
@@ -708,13 +729,16 @@ 
                 return '(' . implode(') ' . $operator . ' (', $parts) . ')';
             }
 
-        } else if ($condition instanceof IToSql) {
+        }
+        else if ($condition instanceof IToSql) {
             return $condition
                 ->setQb($this)
                 ->toSql();
-        } else if ($condition instanceof QueryBuilder) {
+        }
+        else if ($condition instanceof QueryBuilder) {
             return $condition->toSQL();
-        } else if (is_string($condition)) {
+        }
+        else if (is_string($condition)) {
             return $condition;
         }
 
@@ -727,7 +751,8 @@ 
         foreach ($operands as $operand) {
             if (is_array($operand)) {
                 $operand = $this->buildCondition($operand, $params);
-            } else {
+            }
+            else {
                 $operand = $this->parseCondition($operand);
             }
             if ($operand !== '') {
@@ -788,7 +813,8 @@ 
         foreach ($this->_whereAnd as $condition) {
             if (empty($where)) {
                 $where = ['and', $condition];
-            } else {
+            }
+            else {
                 $where = ['and', $where, ['and', $condition]];
             }
         }
@@ -796,7 +822,8 @@ 
         foreach ($this->_whereOr as $condition) {
             if (empty($where)) {
                 $where = ['or', $condition];
-            } else {
+            }
+            else {
                 $where = ['or', $where, ['and', $condition]];
             }
         }
@@ -1121,7 +1148,8 @@ 
     {
         if (strpos($order, '-') === false) {
             $direction = 'ASC';
-        } else {
+        }
+        else {
             $direction = 'DESC';
             $order = substr($order, 1);
         }
@@ -1158,12 +1186,14 @@ 
                 }
                 else if ($column === '?') {
                     $order[] = $this->getAdapter()->getRandomOrder();
-                } else {
+                }
+                else {
                     list($newColumn, $direction) = $this->buildOrderJoin($column);
                     $order[$this->applyTableAlias($newColumn)] = $direction;
                 }
             }
-        } else {
+        }
+        else {
             $order[] = $this->buildOrderJoin($this->_order);
         }
 
@@ -1210,7 +1240,8 @@ 
     {
         if ($this->_alias !== null && !is_array($this->_from)) {
             $from = [$this->_alias => $this->_from];
-        } else {
+        }
+        else {
             $from = $this->_from;
         }
         $sql = $this->getAdapter()->sqlFrom($from);

src/ConnectionManager.php

Braces +2 added lines, -1 removed lines

@@ -50,7 +50,8 @@
         foreach ($config as $key => $value) {
             if (method_exists($this, 'set' . ucfirst($key))) {
                 $this->{'set' . ucfirst($key)}($value);
-            } else {
+            }
+            else {
                 $this->{$key} = $value;
             }
         }

src/Database/Pgsql/LookupCollection.php

Braces +2 added lines, -1 removed lines

@@ -15,7 +15,8 @@
         ];
         if (in_array($lookup, $lookups)) {
             return true;
-        } else {
+        }
+        else {
             return parent::has($lookup);
         }
     }

src/Database/Pgsql/Adapter.php

Braces +6 added lines, -3 removed lines

@@ -193,11 +193,14 @@
     {
         if ($value instanceof \DateTime) {
             $value = $value->format($format);
-        } elseif ($value === null) {
+        }
+        elseif ($value === null) {
             $value = date($format);
-        } elseif (is_numeric($value)) {
+        }
+        elseif (is_numeric($value)) {
             $value = date($format, $value);
-        } elseif (is_string($value)) {
+        }
+        elseif (is_string($value)) {
             $value = date($format, strtotime($value));
         }
         return $value;

src/Database/Mysql/Adapter.php

Braces +12 added lines, -6 removed lines

@@ -92,7 +92,8 @@ 
     {
         if (gettype($value) === 'boolean') {
             return (int)$value;
-        } else {
+        }
+        else {
             return $value ? 1 : 0;
         }
     }
@@ -101,11 +102,14 @@ 
     {
         if ($value instanceof \DateTime) {
             $value = $value->format($format);
-        } elseif ($value === null) {
+        }
+        elseif ($value === null) {
             $value = date($format);
-        } elseif (is_numeric($value)) {
+        }
+        elseif (is_numeric($value)) {
             $value = date($format, $value);
-        } elseif (is_string($value)) {
+        }
+        elseif (is_string($value)) {
             $value = date($format, strtotime($value));
         }
         return $value;
@@ -170,7 +174,8 @@ 
                 $sql .= ' OFFSET ' . $offset;
             }
             return ' ' . $sql;
-        } elseif ($this->hasOffset($offset)) {
+        }
+        elseif ($this->hasOffset($offset)) {
             // limit is not optional in MySQL
             // http://stackoverflow.com/a/271650/1106908
             // http://dev.mysql.com/doc/refman/5.0/en/select.html#idm47619502796240
@@ -196,7 +201,8 @@ 
         }
         if (isset($row['Create Table'])) {
             $sql = $row['Create Table'];
-        } else {
+        }
+        else {
             $row = array_values($row);
             $sql = $row[1];
         }

src/Database/Sqlite/Adapter.php

Braces +8 added lines, -4 removed lines

@@ -178,11 +178,14 @@ 
     {
         if ($value instanceof \DateTime) {
             $value = $value->format($format);
-        } elseif ($value === null) {
+        }
+        elseif ($value === null) {
             $value = date($format);
-        } elseif (is_numeric($value)) {
+        }
+        elseif (is_numeric($value)) {
             $value = date($format, $value);
-        } elseif (is_string($value)) {
+        }
+        elseif (is_string($value)) {
             $value = date($format, strtotime($value));
         }
         return (string)$value;
@@ -219,7 +222,8 @@ 
                 $sql .= ' OFFSET ' . $offset;
             }
             return ' ' . $sql;
-        } elseif ($this->hasOffset($offset)) {
+        }
+        elseif ($this->hasOffset($offset)) {
             // limit is not optional in SQLite
             // http://www.sqlite.org/syntaxdiagrams.html#select-stmt
             // If the LIMIT expression evaluates to a negative value, then there