adumitru68 / QueryBuilder

src/Traits/Objects.php

Indentation +4 added lines, -4 removed lines

@@ -13,9 +13,9 @@
 trait Objects
 {
 
-    /**
-     * @var QueryStructure
-     */
-    protected $queryStructure;
+	/**
+	 * @var QueryStructure
+	 */
+	protected $queryStructure;
 
 }
\ No newline at end of file

src/Traits/SetFields.php

Indentation +42 added lines, -42 removed lines

@@ -13,56 +13,56 @@
 trait SetFields
 {
 
-    use Objects;
+	use Objects;
 
-    private $setValues;
+	private $setValues;
 
-    /**
-     * @param $fieldName
-     * @param $fieldValue
-     * @return $this
-     */
-    public function setField($fieldName, $fieldValue)
-    {
-        $valuePdoString = $this->queryStructure->bindParam($fieldName, $fieldValue);
-        $this->queryStructure->setElement(QueryStructure::SET_FIELDS, "$fieldName = $valuePdoString");
+	/**
+	 * @param $fieldName
+	 * @param $fieldValue
+	 * @return $this
+	 */
+	public function setField($fieldName, $fieldValue)
+	{
+		$valuePdoString = $this->queryStructure->bindParam($fieldName, $fieldValue);
+		$this->queryStructure->setElement(QueryStructure::SET_FIELDS, "$fieldName = $valuePdoString");
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * @param string $expression
-     * @return $this
-     */
-    public function setFieldByExpression($expression)
-    {
-        $this->queryStructure->setElement(QueryStructure::SET_FIELDS, $expression);
+	/**
+	 * @param string $expression
+	 * @return $this
+	 */
+	public function setFieldByExpression($expression)
+	{
+		$this->queryStructure->setElement(QueryStructure::SET_FIELDS, $expression);
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * Set fields by associative array ( fieldName => fieldValue )
-     * @param array $updateFieldsArray
-     * @return $this
-     */
-    public function setFieldsByArray(array $updateFieldsArray)
-    {
-        foreach ($updateFieldsArray as $fieldName => $fieldValue)
-            $this->setField($fieldName, $fieldValue);
+	/**
+	 * Set fields by associative array ( fieldName => fieldValue )
+	 * @param array $updateFieldsArray
+	 * @return $this
+	 */
+	public function setFieldsByArray(array $updateFieldsArray)
+	{
+		foreach ($updateFieldsArray as $fieldName => $fieldValue)
+			$this->setField($fieldName, $fieldValue);
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * @return string
-     */
-    private function getSettingFieldsSyntax()
-    {
-        if (!count($this->queryStructure->getElement(QueryStructure::SET_FIELDS)))
-            return '';
+	/**
+	 * @return string
+	 */
+	private function getSettingFieldsSyntax()
+	{
+		if (!count($this->queryStructure->getElement(QueryStructure::SET_FIELDS)))
+			return '';
 
-        return 'SET ' . implode(', ', $this->queryStructure->getElement(QueryStructure::SET_FIELDS));
-    }
+		return 'SET ' . implode(', ', $this->queryStructure->getElement(QueryStructure::SET_FIELDS));
+	}
 
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -22,10 +22,10 @@ 
      * @param $fieldValue
      * @return $this
      */
-    public function setField($fieldName, $fieldValue)
+    public function setField( $fieldName, $fieldValue )
     {
-        $valuePdoString = $this->queryStructure->bindParam($fieldName, $fieldValue);
-        $this->queryStructure->setElement(QueryStructure::SET_FIELDS, "$fieldName = $valuePdoString");
+        $valuePdoString = $this->queryStructure->bindParam( $fieldName, $fieldValue );
+        $this->queryStructure->setElement( QueryStructure::SET_FIELDS, "$fieldName = $valuePdoString" );
 
         return $this;
     }
@@ -34,9 +34,9 @@ 
      * @param string $expression
      * @return $this
      */
-    public function setFieldByExpression($expression)
+    public function setFieldByExpression( $expression )
     {
-        $this->queryStructure->setElement(QueryStructure::SET_FIELDS, $expression);
+        $this->queryStructure->setElement( QueryStructure::SET_FIELDS, $expression );
 
         return $this;
     }
@@ -46,10 +46,10 @@ 
      * @param array $updateFieldsArray
      * @return $this
      */
-    public function setFieldsByArray(array $updateFieldsArray)
+    public function setFieldsByArray( array $updateFieldsArray )
     {
-        foreach ($updateFieldsArray as $fieldName => $fieldValue)
-            $this->setField($fieldName, $fieldValue);
+        foreach ( $updateFieldsArray as $fieldName => $fieldValue )
+            $this->setField( $fieldName, $fieldValue );
 
         return $this;
     }
@@ -59,10 +59,10 @@ 
      */
     private function getSettingFieldsSyntax()
     {
-        if (!count($this->queryStructure->getElement(QueryStructure::SET_FIELDS)))
+        if ( !count( $this->queryStructure->getElement( QueryStructure::SET_FIELDS ) ) )
             return '';
 
-        return 'SET ' . implode(', ', $this->queryStructure->getElement(QueryStructure::SET_FIELDS));
+        return 'SET ' . implode( ', ', $this->queryStructure->getElement( QueryStructure::SET_FIELDS ) );
     }
 
 }
\ No newline at end of file

Braces +6 added lines, -4 removed lines

@@ -48,8 +48,9 @@ 
      */
     public function setFieldsByArray(array $updateFieldsArray)
     {
-        foreach ($updateFieldsArray as $fieldName => $fieldValue)
-            $this->setField($fieldName, $fieldValue);
+        foreach ($updateFieldsArray as $fieldName => $fieldValue) {
+                    $this->setField($fieldName, $fieldValue);
+        }
 
         return $this;
     }
@@ -59,8 +60,9 @@ 
      */
     private function getSettingFieldsSyntax()
     {
-        if (!count($this->queryStructure->getElement(QueryStructure::SET_FIELDS)))
-            return '';
+        if (!count($this->queryStructure->getElement(QueryStructure::SET_FIELDS))) {
+                    return '';
+        }
 
         return 'SET ' . implode(', ', $this->queryStructure->getElement(QueryStructure::SET_FIELDS));
     }

src/Traits/OrderBy.php

Indentation +47 added lines, -47 removed lines

@@ -15,68 +15,68 @@
 trait OrderBy
 {
 
-    use Objects;
+	use Objects;
 
 
-    /**
-     * @param $column
-     * @param array $allowedColumns
-     * @return $this
-     * @throws QueryException
-     */
-    public function orderBy($column, array $allowedColumns = [])
-    {
-        $column = trim($column);
+	/**
+	 * @param $column
+	 * @param array $allowedColumns
+	 * @return $this
+	 * @throws QueryException
+	 */
+	public function orderBy($column, array $allowedColumns = [])
+	{
+		$column = trim($column);
 
-        if (!$this->validateColumn($column, $allowedColumns))
-            throw new QueryException('Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME);
+		if (!$this->validateColumn($column, $allowedColumns))
+			throw new QueryException('Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME);
 
-        $this->queryStructure->setElement(QueryStructure::ORDER_BY, $column);
+		$this->queryStructure->setElement(QueryStructure::ORDER_BY, $column);
 
-        return $this;
-    }
+		return $this;
+	}
 
 
-    /**
-     * @param $column
-     * @param array $allowedColumns
-     * @return $this
-     * @throws QueryException
-     */
-    public function orderByDesc($column, array $allowedColumns = [])
-    {
-        $column = trim($column);
+	/**
+	 * @param $column
+	 * @param array $allowedColumns
+	 * @return $this
+	 * @throws QueryException
+	 */
+	public function orderByDesc($column, array $allowedColumns = [])
+	{
+		$column = trim($column);
 
-        if (!$this->validateColumn($column, $allowedColumns))
-            throw new QueryException('Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME);
+		if (!$this->validateColumn($column, $allowedColumns))
+			throw new QueryException('Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME);
 
-        $this->queryStructure->setElement(QueryStructure::ORDER_BY, $column . ' DESC');
+		$this->queryStructure->setElement(QueryStructure::ORDER_BY, $column . ' DESC');
 
-        return $this;
-    }
+		return $this;
+	}
 
 
-    /**
-     * @param $expression
-     * @return $this
-     */
-    public function orderByExpression($expression)
-    {
-        $this->queryStructure->setElement(QueryStructure::ORDER_BY, $expression);
+	/**
+	 * @param $expression
+	 * @return $this
+	 */
+	public function orderByExpression($expression)
+	{
+		$this->queryStructure->setElement(QueryStructure::ORDER_BY, $expression);
 
-        return $this;
-    }
+		return $this;
+	}
 
 
-    /**
-     * @return string
-     */
-    private function getOrderBySyntax()
-    {
-        if (count($this->queryStructure->getElement(QueryStructure::ORDER_BY)))
-            return 'ORDER BY ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::ORDER_BY), ', ');
+	/**
+	 * @return string
+	 */
+	private function getOrderBySyntax()
+	{
+		if (count($this->queryStructure->getElement(QueryStructure::ORDER_BY)))
+			return 'ORDER BY ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::ORDER_BY), ', ');
 
-        return '';
-    }
+		return '';
+	}
 
 }
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -24,14 +24,14 @@ 
      * @return $this
      * @throws QueryException
      */
-    public function orderBy($column, array $allowedColumns = [])
+    public function orderBy( $column, array $allowedColumns = [ ] )
     {
-        $column = trim($column);
+        $column = trim( $column );
 
-        if (!$this->validateColumn($column, $allowedColumns))
-            throw new QueryException('Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME);
+        if ( !$this->validateColumn( $column, $allowedColumns ) )
+            throw new QueryException( 'Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
 
-        $this->queryStructure->setElement(QueryStructure::ORDER_BY, $column);
+        $this->queryStructure->setElement( QueryStructure::ORDER_BY, $column );
 
         return $this;
     }
@@ -43,14 +43,14 @@ 
      * @return $this
      * @throws QueryException
      */
-    public function orderByDesc($column, array $allowedColumns = [])
+    public function orderByDesc( $column, array $allowedColumns = [ ] )
     {
-        $column = trim($column);
+        $column = trim( $column );
 
-        if (!$this->validateColumn($column, $allowedColumns))
-            throw new QueryException('Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME);
+        if ( !$this->validateColumn( $column, $allowedColumns ) )
+            throw new QueryException( 'Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
 
-        $this->queryStructure->setElement(QueryStructure::ORDER_BY, $column . ' DESC');
+        $this->queryStructure->setElement( QueryStructure::ORDER_BY, $column . ' DESC' );
 
         return $this;
     }
@@ -60,9 +60,9 @@ 
      * @param $expression
      * @return $this
      */
-    public function orderByExpression($expression)
+    public function orderByExpression( $expression )
     {
-        $this->queryStructure->setElement(QueryStructure::ORDER_BY, $expression);
+        $this->queryStructure->setElement( QueryStructure::ORDER_BY, $expression );
 
         return $this;
     }
@@ -73,8 +73,8 @@ 
      */
     private function getOrderBySyntax()
     {
-        if (count($this->queryStructure->getElement(QueryStructure::ORDER_BY)))
-            return 'ORDER BY ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::ORDER_BY), ', ');
+        if ( count( $this->queryStructure->getElement( QueryStructure::ORDER_BY ) ) )
+            return 'ORDER BY ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::ORDER_BY ), ', ' );
 
         return '';
     }

Braces +9 added lines, -6 removed lines

@@ -28,8 +28,9 @@ 
     {
         $column = trim($column);
 
-        if (!$this->validateColumn($column, $allowedColumns))
-            throw new QueryException('Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME);
+        if (!$this->validateColumn($column, $allowedColumns)) {
+                    throw new QueryException('Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME);
+        }
 
         $this->queryStructure->setElement(QueryStructure::ORDER_BY, $column);
 
@@ -47,8 +48,9 @@ 
     {
         $column = trim($column);
 
-        if (!$this->validateColumn($column, $allowedColumns))
-            throw new QueryException('Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME);
+        if (!$this->validateColumn($column, $allowedColumns)) {
+                    throw new QueryException('Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME);
+        }
 
         $this->queryStructure->setElement(QueryStructure::ORDER_BY, $column . ' DESC');
 
@@ -73,8 +75,9 @@ 
      */
     private function getOrderBySyntax()
     {
-        if (count($this->queryStructure->getElement(QueryStructure::ORDER_BY)))
-            return 'ORDER BY ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::ORDER_BY), ', ');
+        if (count($this->queryStructure->getElement(QueryStructure::ORDER_BY))) {
+                    return 'ORDER BY ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::ORDER_BY), ', ');
+        }
 
         return '';
     }

src/Traits/Join.php

Indentation +120 added lines, -120 removed lines

@@ -14,125 +14,125 @@
 trait Join
 {
 
-    use Objects;
-
-
-    /**
-     * @param $tableJoin
-     * @param $onLeft
-     * @param null $onRight
-     * @return $this
-     */
-    public function innerJoin($tableJoin, $onLeft, $onRight = null)
-    {
-        return $this->makeJoin('INNER JOIN', $tableJoin, $onLeft, $onRight);
-    }
-
-    /**
-     * @param $tableJoin
-     * @param $onLeft
-     * @param null $onRight
-     * @return $this
-     */
-    public function leftJoin($tableJoin, $onLeft, $onRight = null)
-    {
-        return $this->makeJoin('LEFT JOIN', $tableJoin, $onLeft, $onRight);
-    }
-
-    /**
-     * @param $tableJoin
-     * @param $onLeft
-     * @param null $onRight
-     * @return $this
-     */
-    public function leftOuterJoin($tableJoin, $onLeft, $onRight = null)
-    {
-        return $this->makeJoin('LEFT OUTER JOIN', $tableJoin, $onLeft, $onRight);
-    }
-
-    /**
-     * @param $tableJoin
-     * @param $onLeft
-     * @param null $onRight
-     * @return $this
-     */
-    public function rightJoin($tableJoin, $onLeft, $onRight = null)
-    {
-        return $this->makeJoin('RIGHT JOIN', $tableJoin, $onLeft, $onRight);
-    }
-
-    /**
-     * @param $tableJoin
-     * @param $onLeft
-     * @param null $onRight
-     * @return $this
-     */
-    public function rightOuterJoin($tableJoin, $onLeft, $onRight = null)
-    {
-        return $this->makeJoin('RIGHT OUTER JOIN', $tableJoin, $onLeft, $onRight);
-    }
-
-    /**
-     * @param $tableJoin
-     * @param $onLeft
-     * @param null $onRight
-     * @return $this
-     */
-    public function fullJoin($tableJoin, $onLeft, $onRight = null)
-    {
-        return $this->makeJoin('FULL JOIN', $tableJoin, $onLeft, $onRight);
-    }
-
-    /**
-     * @param $tableJoin
-     * @param $onLeft
-     * @param null $onRight
-     * @return $this
-     */
-    public function fullOuterJoin($tableJoin, $onLeft, $onRight = null)
-    {
-        return $this->makeJoin('FULL OUTER JOIN', $tableJoin, $onLeft, $onRight);
-    }
-
-    /**
-     * @param $stringJoin
-     * @return $this
-     */
-    public function join($stringJoin)
-    {
-        $this->queryStructure->setElement(QueryStructure::JOIN, $stringJoin);
-
-        return $this;
-    }
-
-    /**
-     * @param $typeJoin
-     * @param $tableJoin
-     * @param $onLeft
-     * @param null $onRight
-     * @return $this
-     */
-    private function makeJoin($typeJoin, $tableJoin, $onLeft, $onRight = null)
-    {
-        $join = $typeJoin . ' ' . $tableJoin;
-
-        if (is_null($onRight))
-            $join .= " USING ( $onLeft )"; else
-            $join .= " ON $onLeft = $onRight";
-
-        $this->queryStructure->setElement(QueryStructure::JOIN, $join);
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    private function getJoinSyntax()
-    {
-        $joinString = implode(' ', $this->queryStructure->getElement(QueryStructure::JOIN));
-
-        return QueryHelper::clearMultipleSpaces($joinString);
-    }
+	use Objects;
+
+
+	/**
+	 * @param $tableJoin
+	 * @param $onLeft
+	 * @param null $onRight
+	 * @return $this
+	 */
+	public function innerJoin($tableJoin, $onLeft, $onRight = null)
+	{
+		return $this->makeJoin('INNER JOIN', $tableJoin, $onLeft, $onRight);
+	}
+
+	/**
+	 * @param $tableJoin
+	 * @param $onLeft
+	 * @param null $onRight
+	 * @return $this
+	 */
+	public function leftJoin($tableJoin, $onLeft, $onRight = null)
+	{
+		return $this->makeJoin('LEFT JOIN', $tableJoin, $onLeft, $onRight);
+	}
+
+	/**
+	 * @param $tableJoin
+	 * @param $onLeft
+	 * @param null $onRight
+	 * @return $this
+	 */
+	public function leftOuterJoin($tableJoin, $onLeft, $onRight = null)
+	{
+		return $this->makeJoin('LEFT OUTER JOIN', $tableJoin, $onLeft, $onRight);
+	}
+
+	/**
+	 * @param $tableJoin
+	 * @param $onLeft
+	 * @param null $onRight
+	 * @return $this
+	 */
+	public function rightJoin($tableJoin, $onLeft, $onRight = null)
+	{
+		return $this->makeJoin('RIGHT JOIN', $tableJoin, $onLeft, $onRight);
+	}
+
+	/**
+	 * @param $tableJoin
+	 * @param $onLeft
+	 * @param null $onRight
+	 * @return $this
+	 */
+	public function rightOuterJoin($tableJoin, $onLeft, $onRight = null)
+	{
+		return $this->makeJoin('RIGHT OUTER JOIN', $tableJoin, $onLeft, $onRight);
+	}
+
+	/**
+	 * @param $tableJoin
+	 * @param $onLeft
+	 * @param null $onRight
+	 * @return $this
+	 */
+	public function fullJoin($tableJoin, $onLeft, $onRight = null)
+	{
+		return $this->makeJoin('FULL JOIN', $tableJoin, $onLeft, $onRight);
+	}
+
+	/**
+	 * @param $tableJoin
+	 * @param $onLeft
+	 * @param null $onRight
+	 * @return $this
+	 */
+	public function fullOuterJoin($tableJoin, $onLeft, $onRight = null)
+	{
+		return $this->makeJoin('FULL OUTER JOIN', $tableJoin, $onLeft, $onRight);
+	}
+
+	/**
+	 * @param $stringJoin
+	 * @return $this
+	 */
+	public function join($stringJoin)
+	{
+		$this->queryStructure->setElement(QueryStructure::JOIN, $stringJoin);
+
+		return $this;
+	}
+
+	/**
+	 * @param $typeJoin
+	 * @param $tableJoin
+	 * @param $onLeft
+	 * @param null $onRight
+	 * @return $this
+	 */
+	private function makeJoin($typeJoin, $tableJoin, $onLeft, $onRight = null)
+	{
+		$join = $typeJoin . ' ' . $tableJoin;
+
+		if (is_null($onRight))
+			$join .= " USING ( $onLeft )"; else
+			$join .= " ON $onLeft = $onRight";
+
+		$this->queryStructure->setElement(QueryStructure::JOIN, $join);
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	private function getJoinSyntax()
+	{
+		$joinString = implode(' ', $this->queryStructure->getElement(QueryStructure::JOIN));
+
+		return QueryHelper::clearMultipleSpaces($joinString);
+	}
 
 }
\ No newline at end of file

Spacing +21 added lines, -21 removed lines

@@ -23,9 +23,9 @@ 
      * @param null $onRight
      * @return $this
      */
-    public function innerJoin($tableJoin, $onLeft, $onRight = null)
+    public function innerJoin( $tableJoin, $onLeft, $onRight = null )
     {
-        return $this->makeJoin('INNER JOIN', $tableJoin, $onLeft, $onRight);
+        return $this->makeJoin( 'INNER JOIN', $tableJoin, $onLeft, $onRight );
     }
 
     /**
@@ -34,9 +34,9 @@ 
      * @param null $onRight
      * @return $this
      */
-    public function leftJoin($tableJoin, $onLeft, $onRight = null)
+    public function leftJoin( $tableJoin, $onLeft, $onRight = null )
     {
-        return $this->makeJoin('LEFT JOIN', $tableJoin, $onLeft, $onRight);
+        return $this->makeJoin( 'LEFT JOIN', $tableJoin, $onLeft, $onRight );
     }
 
     /**
@@ -45,9 +45,9 @@ 
      * @param null $onRight
      * @return $this
      */
-    public function leftOuterJoin($tableJoin, $onLeft, $onRight = null)
+    public function leftOuterJoin( $tableJoin, $onLeft, $onRight = null )
     {
-        return $this->makeJoin('LEFT OUTER JOIN', $tableJoin, $onLeft, $onRight);
+        return $this->makeJoin( 'LEFT OUTER JOIN', $tableJoin, $onLeft, $onRight );
     }
 
     /**
@@ -56,9 +56,9 @@ 
      * @param null $onRight
      * @return $this
      */
-    public function rightJoin($tableJoin, $onLeft, $onRight = null)
+    public function rightJoin( $tableJoin, $onLeft, $onRight = null )
     {
-        return $this->makeJoin('RIGHT JOIN', $tableJoin, $onLeft, $onRight);
+        return $this->makeJoin( 'RIGHT JOIN', $tableJoin, $onLeft, $onRight );
     }
 
     /**
@@ -67,9 +67,9 @@ 
      * @param null $onRight
      * @return $this
      */
-    public function rightOuterJoin($tableJoin, $onLeft, $onRight = null)
+    public function rightOuterJoin( $tableJoin, $onLeft, $onRight = null )
     {
-        return $this->makeJoin('RIGHT OUTER JOIN', $tableJoin, $onLeft, $onRight);
+        return $this->makeJoin( 'RIGHT OUTER JOIN', $tableJoin, $onLeft, $onRight );
     }
 
     /**
@@ -78,9 +78,9 @@ 
      * @param null $onRight
      * @return $this
      */
-    public function fullJoin($tableJoin, $onLeft, $onRight = null)
+    public function fullJoin( $tableJoin, $onLeft, $onRight = null )
     {
-        return $this->makeJoin('FULL JOIN', $tableJoin, $onLeft, $onRight);
+        return $this->makeJoin( 'FULL JOIN', $tableJoin, $onLeft, $onRight );
     }
 
     /**
@@ -89,18 +89,18 @@ 
      * @param null $onRight
      * @return $this
      */
-    public function fullOuterJoin($tableJoin, $onLeft, $onRight = null)
+    public function fullOuterJoin( $tableJoin, $onLeft, $onRight = null )
     {
-        return $this->makeJoin('FULL OUTER JOIN', $tableJoin, $onLeft, $onRight);
+        return $this->makeJoin( 'FULL OUTER JOIN', $tableJoin, $onLeft, $onRight );
     }
 
     /**
      * @param $stringJoin
      * @return $this
      */
-    public function join($stringJoin)
+    public function join( $stringJoin )
     {
-        $this->queryStructure->setElement(QueryStructure::JOIN, $stringJoin);
+        $this->queryStructure->setElement( QueryStructure::JOIN, $stringJoin );
 
         return $this;
     }
@@ -112,15 +112,15 @@ 
      * @param null $onRight
      * @return $this
      */
-    private function makeJoin($typeJoin, $tableJoin, $onLeft, $onRight = null)
+    private function makeJoin( $typeJoin, $tableJoin, $onLeft, $onRight = null )
     {
         $join = $typeJoin . ' ' . $tableJoin;
 
-        if (is_null($onRight))
+        if ( is_null( $onRight ) )
             $join .= " USING ( $onLeft )"; else
             $join .= " ON $onLeft = $onRight";
 
-        $this->queryStructure->setElement(QueryStructure::JOIN, $join);
+        $this->queryStructure->setElement( QueryStructure::JOIN, $join );
 
         return $this;
     }
@@ -130,9 +130,9 @@ 
      */
     private function getJoinSyntax()
     {
-        $joinString = implode(' ', $this->queryStructure->getElement(QueryStructure::JOIN));
+        $joinString = implode( ' ', $this->queryStructure->getElement( QueryStructure::JOIN ) );
 
-        return QueryHelper::clearMultipleSpaces($joinString);
+        return QueryHelper::clearMultipleSpaces( $joinString );
     }
 
 }
\ No newline at end of file

Braces +5 added lines, -3 removed lines

@@ -116,9 +116,11 @@
     {
         $join = $typeJoin . ' ' . $tableJoin;
 
-        if (is_null($onRight))
-            $join .= " USING ( $onLeft )"; else
-            $join .= " ON $onLeft = $onRight";
+        if (is_null($onRight)) {
+                    $join .= " USING ( $onLeft )";
+        } else {
+                        $join .= " ON $onLeft = $onRight";
+            }
 
         $this->queryStructure->setElement(QueryStructure::JOIN, $join);
 

src/Traits/TableValidation.php

Indentation +46 added lines, -46 removed lines

@@ -18,52 +18,52 @@
 trait TableValidation
 {
 
-    private function validateTable($table)
-    {
-        switch (gettype($table)) {
-
-            case QueryStructure::ELEMENT_TYPE_STRING:
-                $table = $this->validateTableName($table);
-                break;
-            case QueryStructure::ELEMENT_TYPE_OBJECT:
-                $table = $this->validateTableSubQuery($table);
-                break;
-            default:
-                throw new QueryException('Invalid table type parameter: ' . gettype($table), QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
-
-        }
-
-        return $table;
-    }
-
-    /**
-     * @param $table
-     * @return mixed|string
-     * @throws QueryException
-     */
-    private function validateTableName($table)
-    {
-        $table = trim($table);
-
-        if ('' === $table)
-            throw new QueryException('Table name is empty string!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
-
-        if (DbConfig::getInstance()->useTablePrefix())
-            $table = str_ireplace('::', DbConfig::getInstance()->getTablePrefix(), $table);
-
-        return $table;
-    }
-
-    private function validateTableSubQuery($table)
-    {
-        if ($this->statement !== QueryStatement::QUERY_STATEMENT_SELECT)
-            throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
-
-        if (!is_a($table, QuerySelect::class))
-            throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
-
-        return $table;
-    }
+	private function validateTable($table)
+	{
+		switch (gettype($table)) {
+
+			case QueryStructure::ELEMENT_TYPE_STRING:
+				$table = $this->validateTableName($table);
+				break;
+			case QueryStructure::ELEMENT_TYPE_OBJECT:
+				$table = $this->validateTableSubQuery($table);
+				break;
+			default:
+				throw new QueryException('Invalid table type parameter: ' . gettype($table), QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+
+		}
+
+		return $table;
+	}
+
+	/**
+	 * @param $table
+	 * @return mixed|string
+	 * @throws QueryException
+	 */
+	private function validateTableName($table)
+	{
+		$table = trim($table);
+
+		if ('' === $table)
+			throw new QueryException('Table name is empty string!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+
+		if (DbConfig::getInstance()->useTablePrefix())
+			$table = str_ireplace('::', DbConfig::getInstance()->getTablePrefix(), $table);
+
+		return $table;
+	}
+
+	private function validateTableSubQuery($table)
+	{
+		if ($this->statement !== QueryStatement::QUERY_STATEMENT_SELECT)
+			throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+
+		if (!is_a($table, QuerySelect::class))
+			throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+
+		return $table;
+	}
 
 
 }
\ No newline at end of file

Spacing +16 added lines, -16 removed lines

@@ -18,18 +18,18 @@ 
 trait TableValidation
 {
 
-    private function validateTable($table)
+    private function validateTable( $table )
     {
-        switch (gettype($table)) {
+        switch ( gettype( $table ) ) {
 
             case QueryStructure::ELEMENT_TYPE_STRING:
-                $table = $this->validateTableName($table);
+                $table = $this->validateTableName( $table );
                 break;
             case QueryStructure::ELEMENT_TYPE_OBJECT:
-                $table = $this->validateTableSubQuery($table);
+                $table = $this->validateTableSubQuery( $table );
                 break;
             default:
-                throw new QueryException('Invalid table type parameter: ' . gettype($table), QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+                throw new QueryException( 'Invalid table type parameter: ' . gettype( $table ), QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT );
 
         }
 
@@ -41,26 +41,26 @@ 
      * @return mixed|string
      * @throws QueryException
      */
-    private function validateTableName($table)
+    private function validateTableName( $table )
     {
-        $table = trim($table);
+        $table = trim( $table );
 
-        if ('' === $table)
-            throw new QueryException('Table name is empty string!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        if ( '' === $table )
+            throw new QueryException( 'Table name is empty string!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT );
 
-        if (DbConfig::getInstance()->useTablePrefix())
-            $table = str_ireplace('::', DbConfig::getInstance()->getTablePrefix(), $table);
+        if ( DbConfig::getInstance()->useTablePrefix() )
+            $table = str_ireplace( '::', DbConfig::getInstance()->getTablePrefix(), $table );
 
         return $table;
     }
 
-    private function validateTableSubQuery($table)
+    private function validateTableSubQuery( $table )
     {
-        if ($this->statement !== QueryStatement::QUERY_STATEMENT_SELECT)
-            throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        if ( $this->statement !== QueryStatement::QUERY_STATEMENT_SELECT )
+            throw new QueryException( 'Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT );
 
-        if (!is_a($table, QuerySelect::class))
-            throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        if ( !is_a( $table, QuerySelect::class ) )
+            throw new QueryException( 'Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT );
 
         return $table;
     }

Braces +12 added lines, -8 removed lines

@@ -45,22 +45,26 @@
     {
         $table = trim($table);
 
-        if ('' === $table)
-            throw new QueryException('Table name is empty string!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        if ('' === $table) {
+                    throw new QueryException('Table name is empty string!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        }
 
-        if (DbConfig::getInstance()->useTablePrefix())
-            $table = str_ireplace('::', DbConfig::getInstance()->getTablePrefix(), $table);
+        if (DbConfig::getInstance()->useTablePrefix()) {
+                    $table = str_ireplace('::', DbConfig::getInstance()->getTablePrefix(), $table);
+        }
 
         return $table;
     }
 
     private function validateTableSubQuery($table)
     {
-        if ($this->statement !== QueryStatement::QUERY_STATEMENT_SELECT)
-            throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        if ($this->statement !== QueryStatement::QUERY_STATEMENT_SELECT) {
+                    throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        }
 
-        if (!is_a($table, QuerySelect::class))
-            throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        if (!is_a($table, QuerySelect::class)) {
+                    throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        }
 
         return $table;
     }

src/Traits/Where.php

Indentation +344 added lines, -344 removed lines

@@ -13,349 +13,349 @@
 trait Where
 {
 
-    use Objects;
-
-
-    /**
-     * @param $field
-     * @param $value
-     * @param $glue
-     * @return $this
-     */
-    public function whereEqual($field, $value, $glue = 'AND')
-    {
-        return $this->where(array($field, $value, '='), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orWhereEqual($field, $value)
-    {
-        return $this->where(array($field, $value, '='), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function whereNotEqual($field, $value, $glue = 'AND')
-    {
-        return $this->where(array($field, $value, '<>'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orWhereNotEqual($field, $value)
-    {
-        return $this->where(array($field, $value, '<>'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function whereLessThan($field, $value, $glue = 'AND')
-    {
-        return $this->where(array($field, $value, '<'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orWhereLessThan($field, $value)
-    {
-        return $this->where(array($field, $value, '<'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function whereLessThanOrEqual($field, $value, $glue = 'AND')
-    {
-        return $this->where(array($field, $value, '<='), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orWhereLessThanOrEqual($field, $value)
-    {
-        return $this->where(array($field, $value, '<='), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function whereGreaterThan($field, $value, $glue = 'AND')
-    {
-        return $this->where(array($field, $value, '>'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orWhereGreaterThan($field, $value)
-    {
-        return $this->where(array($field, $value, '>'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function whereGreaterThanOrEqual($field, $value, $glue = 'AND')
-    {
-        return $this->where(array($field, $value, '>='), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orWhereGreaterThanOrEqual($field, $value)
-    {
-        return $this->where(array($field, $value, '>='), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function whereLike($field, $value, $glue = 'AND')
-    {
-        return $this->where(array($field, $value, 'LIKE'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orWhereLike($field, $value)
-    {
-        return $this->where(array($field, $value, 'LIKE'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function whereNotLike($field, $value, $glue = 'AND')
-    {
-        return $this->where(array($field, $value, 'NOT LIKE'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orWhereNotLike($field, $value)
-    {
-        return $this->where(array($field, $value, 'NOT LIKE'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $min
-     * @param $max
-     * @param string $glue
-     * @return $this
-     */
-    public function whereBetween($field, $min, $max, $glue = 'AND')
-    {
-        return $this->where(array($field, array($min, $max), 'BETWEEN'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $min
-     * @param $max
-     * @return $this
-     */
-    public function orWhereBetween($field, $min, $max)
-    {
-        return $this->where(array($field, array($min, $max), 'BETWEEN'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $min
-     * @param $max
-     * @param string $glue
-     * @return $this
-     */
-    public function whereNotBetween($field, $min, $max, $glue = 'AND')
-    {
-        return $this->where(array($field, array($min, $max), 'NOT BETWEEN'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $min
-     * @param $max
-     * @return $this
-     */
-    public function orWhereNotBetween($field, $min, $max)
-    {
-        return $this->where(array($field, array($min, $max), 'NOT BETWEEN'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function whereIn($field, $value, $glue = 'AND')
-    {
-        return $this->where(array($field, $value, 'IN'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orWhereIn($field, $value)
-    {
-        return $this->where(array($field, $value, 'IN'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function whereNotIn($field, $value, $glue = 'AND')
-    {
-        return $this->where(array($field, $value, 'NOT IN'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orWhereNotIn($field, $value)
-    {
-        return $this->where(array($field, $value, 'NOT IN'), 'OR');
-    }
-
-    /**
-     * @param $whereString
-     * @param array $bindParams
-     * @param string $glue
-     * @return $this
-     */
-    public function whereExpression($whereString, array $bindParams = [], $glue = 'AND')
-    {
-        $whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
-
-        return $this->where($whereString, $glue);
-    }
-
-    /**
-     * @param $whereString
-     * @param array $bindParams
-     * @return $this
-     */
-    public function orWhereExpression($whereString, array $bindParams = [])
-    {
-        $whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
-
-        return $this->where($whereString, 'OR');
-    }
-
-    /**
-     * @return $this
-     */
-    public function whereInvertResult()
-    {
-        $this->queryStructure->setElement(QueryStructure::WHERE_INVERT, 1);
-
-        return $this;
-    }
-
-    /**
-     * @param string $glue
-     * @return $this
-     */
-    public function whereGroup($glue = 'AND')
-    {
-        $this->queryStructure->setElement(QueryStructure::WHERE, array('glue' => $glue, 'body' => '(', 'type' => 'start_where_group'));
-
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    public function orWhereGroup()
-    {
-        return $this->whereGroup('OR');
-    }
-
-    /**
-     * @return $this
-     */
-    public function whereGroupEnd()
-    {
-        $this->queryStructure->setElement(QueryStructure::WHERE, array('glue' => '', 'body' => ')', 'type' => 'end_where_group'));
-
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    public function ignoreWhereTrigger()
-    {
-        $this->queryStructure->setElement(QueryStructure::WHERE_TRIGGER, 0);
-
-        return $this;
-    }
-
-
-    /**
-     * @param string|array $param
-     * @param string $glue
-     * @return $this
-     */
-    private function where($param, $glue = 'AND')
-    {
-        return $this->/** @scrutinizer ignore-call */
-        createCondition($param, $glue, QueryStructure::WHERE);
-    }
+	use Objects;
+
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param $glue
+	 * @return $this
+	 */
+	public function whereEqual($field, $value, $glue = 'AND')
+	{
+		return $this->where(array($field, $value, '='), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orWhereEqual($field, $value)
+	{
+		return $this->where(array($field, $value, '='), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function whereNotEqual($field, $value, $glue = 'AND')
+	{
+		return $this->where(array($field, $value, '<>'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orWhereNotEqual($field, $value)
+	{
+		return $this->where(array($field, $value, '<>'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function whereLessThan($field, $value, $glue = 'AND')
+	{
+		return $this->where(array($field, $value, '<'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orWhereLessThan($field, $value)
+	{
+		return $this->where(array($field, $value, '<'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function whereLessThanOrEqual($field, $value, $glue = 'AND')
+	{
+		return $this->where(array($field, $value, '<='), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orWhereLessThanOrEqual($field, $value)
+	{
+		return $this->where(array($field, $value, '<='), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function whereGreaterThan($field, $value, $glue = 'AND')
+	{
+		return $this->where(array($field, $value, '>'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orWhereGreaterThan($field, $value)
+	{
+		return $this->where(array($field, $value, '>'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function whereGreaterThanOrEqual($field, $value, $glue = 'AND')
+	{
+		return $this->where(array($field, $value, '>='), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orWhereGreaterThanOrEqual($field, $value)
+	{
+		return $this->where(array($field, $value, '>='), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function whereLike($field, $value, $glue = 'AND')
+	{
+		return $this->where(array($field, $value, 'LIKE'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orWhereLike($field, $value)
+	{
+		return $this->where(array($field, $value, 'LIKE'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function whereNotLike($field, $value, $glue = 'AND')
+	{
+		return $this->where(array($field, $value, 'NOT LIKE'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orWhereNotLike($field, $value)
+	{
+		return $this->where(array($field, $value, 'NOT LIKE'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $min
+	 * @param $max
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function whereBetween($field, $min, $max, $glue = 'AND')
+	{
+		return $this->where(array($field, array($min, $max), 'BETWEEN'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $min
+	 * @param $max
+	 * @return $this
+	 */
+	public function orWhereBetween($field, $min, $max)
+	{
+		return $this->where(array($field, array($min, $max), 'BETWEEN'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $min
+	 * @param $max
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function whereNotBetween($field, $min, $max, $glue = 'AND')
+	{
+		return $this->where(array($field, array($min, $max), 'NOT BETWEEN'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $min
+	 * @param $max
+	 * @return $this
+	 */
+	public function orWhereNotBetween($field, $min, $max)
+	{
+		return $this->where(array($field, array($min, $max), 'NOT BETWEEN'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function whereIn($field, $value, $glue = 'AND')
+	{
+		return $this->where(array($field, $value, 'IN'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orWhereIn($field, $value)
+	{
+		return $this->where(array($field, $value, 'IN'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function whereNotIn($field, $value, $glue = 'AND')
+	{
+		return $this->where(array($field, $value, 'NOT IN'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orWhereNotIn($field, $value)
+	{
+		return $this->where(array($field, $value, 'NOT IN'), 'OR');
+	}
+
+	/**
+	 * @param $whereString
+	 * @param array $bindParams
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function whereExpression($whereString, array $bindParams = [], $glue = 'AND')
+	{
+		$whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
+
+		return $this->where($whereString, $glue);
+	}
+
+	/**
+	 * @param $whereString
+	 * @param array $bindParams
+	 * @return $this
+	 */
+	public function orWhereExpression($whereString, array $bindParams = [])
+	{
+		$whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
+
+		return $this->where($whereString, 'OR');
+	}
+
+	/**
+	 * @return $this
+	 */
+	public function whereInvertResult()
+	{
+		$this->queryStructure->setElement(QueryStructure::WHERE_INVERT, 1);
+
+		return $this;
+	}
+
+	/**
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function whereGroup($glue = 'AND')
+	{
+		$this->queryStructure->setElement(QueryStructure::WHERE, array('glue' => $glue, 'body' => '(', 'type' => 'start_where_group'));
+
+		return $this;
+	}
+
+	/**
+	 * @return $this
+	 */
+	public function orWhereGroup()
+	{
+		return $this->whereGroup('OR');
+	}
+
+	/**
+	 * @return $this
+	 */
+	public function whereGroupEnd()
+	{
+		$this->queryStructure->setElement(QueryStructure::WHERE, array('glue' => '', 'body' => ')', 'type' => 'end_where_group'));
+
+		return $this;
+	}
+
+	/**
+	 * @return $this
+	 */
+	public function ignoreWhereTrigger()
+	{
+		$this->queryStructure->setElement(QueryStructure::WHERE_TRIGGER, 0);
+
+		return $this;
+	}
+
+
+	/**
+	 * @param string|array $param
+	 * @param string $glue
+	 * @return $this
+	 */
+	private function where($param, $glue = 'AND')
+	{
+		return $this->/** @scrutinizer ignore-call */
+		createCondition($param, $glue, QueryStructure::WHERE);
+	}
 
 }
\ No newline at end of file

Spacing +62 added lines, -62 removed lines

@@ -22,9 +22,9 @@ 
      * @param $glue
      * @return $this
      */
-    public function whereEqual($field, $value, $glue = 'AND')
+    public function whereEqual( $field, $value, $glue = 'AND' )
     {
-        return $this->where(array($field, $value, '='), $glue);
+        return $this->where( array( $field, $value, '=' ), $glue );
     }
 
     /**
@@ -32,9 +32,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orWhereEqual($field, $value)
+    public function orWhereEqual( $field, $value )
     {
-        return $this->where(array($field, $value, '='), 'OR');
+        return $this->where( array( $field, $value, '=' ), 'OR' );
     }
 
     /**
@@ -43,9 +43,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function whereNotEqual($field, $value, $glue = 'AND')
+    public function whereNotEqual( $field, $value, $glue = 'AND' )
     {
-        return $this->where(array($field, $value, '<>'), $glue);
+        return $this->where( array( $field, $value, '<>' ), $glue );
     }
 
     /**
@@ -53,9 +53,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orWhereNotEqual($field, $value)
+    public function orWhereNotEqual( $field, $value )
     {
-        return $this->where(array($field, $value, '<>'), 'OR');
+        return $this->where( array( $field, $value, '<>' ), 'OR' );
     }
 
     /**
@@ -64,9 +64,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function whereLessThan($field, $value, $glue = 'AND')
+    public function whereLessThan( $field, $value, $glue = 'AND' )
     {
-        return $this->where(array($field, $value, '<'), $glue);
+        return $this->where( array( $field, $value, '<' ), $glue );
     }
 
     /**
@@ -74,9 +74,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orWhereLessThan($field, $value)
+    public function orWhereLessThan( $field, $value )
     {
-        return $this->where(array($field, $value, '<'), 'OR');
+        return $this->where( array( $field, $value, '<' ), 'OR' );
     }
 
     /**
@@ -85,9 +85,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function whereLessThanOrEqual($field, $value, $glue = 'AND')
+    public function whereLessThanOrEqual( $field, $value, $glue = 'AND' )
     {
-        return $this->where(array($field, $value, '<='), $glue);
+        return $this->where( array( $field, $value, '<=' ), $glue );
     }
 
     /**
@@ -95,9 +95,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orWhereLessThanOrEqual($field, $value)
+    public function orWhereLessThanOrEqual( $field, $value )
     {
-        return $this->where(array($field, $value, '<='), 'OR');
+        return $this->where( array( $field, $value, '<=' ), 'OR' );
     }
 
     /**
@@ -106,9 +106,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function whereGreaterThan($field, $value, $glue = 'AND')
+    public function whereGreaterThan( $field, $value, $glue = 'AND' )
     {
-        return $this->where(array($field, $value, '>'), $glue);
+        return $this->where( array( $field, $value, '>' ), $glue );
     }
 
     /**
@@ -116,9 +116,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orWhereGreaterThan($field, $value)
+    public function orWhereGreaterThan( $field, $value )
     {
-        return $this->where(array($field, $value, '>'), 'OR');
+        return $this->where( array( $field, $value, '>' ), 'OR' );
     }
 
     /**
@@ -127,9 +127,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function whereGreaterThanOrEqual($field, $value, $glue = 'AND')
+    public function whereGreaterThanOrEqual( $field, $value, $glue = 'AND' )
     {
-        return $this->where(array($field, $value, '>='), $glue);
+        return $this->where( array( $field, $value, '>=' ), $glue );
     }
 
     /**
@@ -137,9 +137,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orWhereGreaterThanOrEqual($field, $value)
+    public function orWhereGreaterThanOrEqual( $field, $value )
     {
-        return $this->where(array($field, $value, '>='), 'OR');
+        return $this->where( array( $field, $value, '>=' ), 'OR' );
     }
 
     /**
@@ -148,9 +148,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function whereLike($field, $value, $glue = 'AND')
+    public function whereLike( $field, $value, $glue = 'AND' )
     {
-        return $this->where(array($field, $value, 'LIKE'), $glue);
+        return $this->where( array( $field, $value, 'LIKE' ), $glue );
     }
 
     /**
@@ -158,9 +158,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orWhereLike($field, $value)
+    public function orWhereLike( $field, $value )
     {
-        return $this->where(array($field, $value, 'LIKE'), 'OR');
+        return $this->where( array( $field, $value, 'LIKE' ), 'OR' );
     }
 
     /**
@@ -169,9 +169,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function whereNotLike($field, $value, $glue = 'AND')
+    public function whereNotLike( $field, $value, $glue = 'AND' )
     {
-        return $this->where(array($field, $value, 'NOT LIKE'), $glue);
+        return $this->where( array( $field, $value, 'NOT LIKE' ), $glue );
     }
 
     /**
@@ -179,9 +179,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orWhereNotLike($field, $value)
+    public function orWhereNotLike( $field, $value )
     {
-        return $this->where(array($field, $value, 'NOT LIKE'), 'OR');
+        return $this->where( array( $field, $value, 'NOT LIKE' ), 'OR' );
     }
 
     /**
@@ -191,9 +191,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function whereBetween($field, $min, $max, $glue = 'AND')
+    public function whereBetween( $field, $min, $max, $glue = 'AND' )
     {
-        return $this->where(array($field, array($min, $max), 'BETWEEN'), $glue);
+        return $this->where( array( $field, array( $min, $max ), 'BETWEEN' ), $glue );
     }
 
     /**
@@ -202,9 +202,9 @@ 
      * @param $max
      * @return $this
      */
-    public function orWhereBetween($field, $min, $max)
+    public function orWhereBetween( $field, $min, $max )
     {
-        return $this->where(array($field, array($min, $max), 'BETWEEN'), 'OR');
+        return $this->where( array( $field, array( $min, $max ), 'BETWEEN' ), 'OR' );
     }
 
     /**
@@ -214,9 +214,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function whereNotBetween($field, $min, $max, $glue = 'AND')
+    public function whereNotBetween( $field, $min, $max, $glue = 'AND' )
     {
-        return $this->where(array($field, array($min, $max), 'NOT BETWEEN'), $glue);
+        return $this->where( array( $field, array( $min, $max ), 'NOT BETWEEN' ), $glue );
     }
 
     /**
@@ -225,9 +225,9 @@ 
      * @param $max
      * @return $this
      */
-    public function orWhereNotBetween($field, $min, $max)
+    public function orWhereNotBetween( $field, $min, $max )
     {
-        return $this->where(array($field, array($min, $max), 'NOT BETWEEN'), 'OR');
+        return $this->where( array( $field, array( $min, $max ), 'NOT BETWEEN' ), 'OR' );
     }
 
     /**
@@ -236,9 +236,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function whereIn($field, $value, $glue = 'AND')
+    public function whereIn( $field, $value, $glue = 'AND' )
     {
-        return $this->where(array($field, $value, 'IN'), $glue);
+        return $this->where( array( $field, $value, 'IN' ), $glue );
     }
 
     /**
@@ -246,9 +246,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orWhereIn($field, $value)
+    public function orWhereIn( $field, $value )
     {
-        return $this->where(array($field, $value, 'IN'), 'OR');
+        return $this->where( array( $field, $value, 'IN' ), 'OR' );
     }
 
     /**
@@ -257,9 +257,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function whereNotIn($field, $value, $glue = 'AND')
+    public function whereNotIn( $field, $value, $glue = 'AND' )
     {
-        return $this->where(array($field, $value, 'NOT IN'), $glue);
+        return $this->where( array( $field, $value, 'NOT IN' ), $glue );
     }
 
     /**
@@ -267,9 +267,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orWhereNotIn($field, $value)
+    public function orWhereNotIn( $field, $value )
     {
-        return $this->where(array($field, $value, 'NOT IN'), 'OR');
+        return $this->where( array( $field, $value, 'NOT IN' ), 'OR' );
     }
 
     /**
@@ -278,11 +278,11 @@ 
      * @param string $glue
      * @return $this
      */
-    public function whereExpression($whereString, array $bindParams = [], $glue = 'AND')
+    public function whereExpression( $whereString, array $bindParams = [ ], $glue = 'AND' )
     {
-        $whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
+        $whereString = $this->queryStructure->bindParamsExpression( $whereString, $bindParams );
 
-        return $this->where($whereString, $glue);
+        return $this->where( $whereString, $glue );
     }
 
     /**
@@ -290,11 +290,11 @@ 
      * @param array $bindParams
      * @return $this
      */
-    public function orWhereExpression($whereString, array $bindParams = [])
+    public function orWhereExpression( $whereString, array $bindParams = [ ] )
     {
-        $whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
+        $whereString = $this->queryStructure->bindParamsExpression( $whereString, $bindParams );
 
-        return $this->where($whereString, 'OR');
+        return $this->where( $whereString, 'OR' );
     }
 
     /**
@@ -302,7 +302,7 @@ 
      */
     public function whereInvertResult()
     {
-        $this->queryStructure->setElement(QueryStructure::WHERE_INVERT, 1);
+        $this->queryStructure->setElement( QueryStructure::WHERE_INVERT, 1 );
 
         return $this;
     }
@@ -311,9 +311,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function whereGroup($glue = 'AND')
+    public function whereGroup( $glue = 'AND' )
     {
-        $this->queryStructure->setElement(QueryStructure::WHERE, array('glue' => $glue, 'body' => '(', 'type' => 'start_where_group'));
+        $this->queryStructure->setElement( QueryStructure::WHERE, array( 'glue' => $glue, 'body' => '(', 'type' => 'start_where_group' ) );
 
         return $this;
     }
@@ -323,7 +323,7 @@ 
      */
     public function orWhereGroup()
     {
-        return $this->whereGroup('OR');
+        return $this->whereGroup( 'OR' );
     }
 
     /**
@@ -331,7 +331,7 @@ 
      */
     public function whereGroupEnd()
     {
-        $this->queryStructure->setElement(QueryStructure::WHERE, array('glue' => '', 'body' => ')', 'type' => 'end_where_group'));
+        $this->queryStructure->setElement( QueryStructure::WHERE, array( 'glue' => '', 'body' => ')', 'type' => 'end_where_group' ) );
 
         return $this;
     }
@@ -341,7 +341,7 @@ 
      */
     public function ignoreWhereTrigger()
     {
-        $this->queryStructure->setElement(QueryStructure::WHERE_TRIGGER, 0);
+        $this->queryStructure->setElement( QueryStructure::WHERE_TRIGGER, 0 );
 
         return $this;
     }
@@ -352,10 +352,10 @@ 
      * @param string $glue
      * @return $this
      */
-    private function where($param, $glue = 'AND')
+    private function where( $param, $glue = 'AND' )
     {
         return $this->/** @scrutinizer ignore-call */
-        createCondition($param, $glue, QueryStructure::WHERE);
+        createCondition( $param, $glue, QueryStructure::WHERE );
     }
 
 }
\ No newline at end of file

src/Traits/Limit.php

Indentation +30 added lines, -30 removed lines

@@ -15,48 +15,48 @@
 trait Limit
 {
 
-    use Objects;
+	use Objects;
 
 
-    /**
-     * @param int $limit
-     * @param null $offset
-     * @return $this
-     * @throws QueryException
-     */
-    public function limit($limit = 0, $offset = null)
-    {
-        $limit = trim($limit);
+	/**
+	 * @param int $limit
+	 * @param null $offset
+	 * @return $this
+	 * @throws QueryException
+	 */
+	public function limit($limit = 0, $offset = null)
+	{
+		$limit = trim($limit);
 
-        if (!QueryHelper::isInteger($limit))
-            throw new QueryException('Invalid Limit value', QueryException::QUERY_ERROR_INVALID_LIMIT);
+		if (!QueryHelper::isInteger($limit))
+			throw new QueryException('Invalid Limit value', QueryException::QUERY_ERROR_INVALID_LIMIT);
 
-        if ($limit == 0)
-            throw new QueryException('Invalid Limit zero', QueryException::QUERY_ERROR_INVALID_LIMIT_ZERO);
+		if ($limit == 0)
+			throw new QueryException('Invalid Limit zero', QueryException::QUERY_ERROR_INVALID_LIMIT_ZERO);
 
-        if (is_null($offset)) {
-            $this->queryStructure->setElement(QueryStructure::LIMIT, $limit);
+		if (is_null($offset)) {
+			$this->queryStructure->setElement(QueryStructure::LIMIT, $limit);
 
-            return $this;
-        }
+			return $this;
+		}
 
-        $offset = trim($offset);
+		$offset = trim($offset);
 
-        if (!QueryHelper::isInteger($offset))
-            throw new QueryException('Invalid Limit offset', QueryException::QUERY_ERROR_INVALID_LIMIT_OFFSET);
+		if (!QueryHelper::isInteger($offset))
+			throw new QueryException('Invalid Limit offset', QueryException::QUERY_ERROR_INVALID_LIMIT_OFFSET);
 
-        $this->queryStructure->setElement(QueryStructure::LIMIT, $offset . ',' . $limit);
+		$this->queryStructure->setElement(QueryStructure::LIMIT, $offset . ',' . $limit);
 
-        return $this;
-    }
+		return $this;
+	}
 
-    private function getLimitSyntax()
-    {
-        if (!$this->queryStructure->getElement(QueryStructure::LIMIT))
-            return '';
+	private function getLimitSyntax()
+	{
+		if (!$this->queryStructure->getElement(QueryStructure::LIMIT))
+			return '';
 
-        return 'LIMIT ' . $this->queryStructure->getElement(QueryStructure::LIMIT);
-    }
+		return 'LIMIT ' . $this->queryStructure->getElement(QueryStructure::LIMIT);
+	}
 
 }
 

Spacing +14 added lines, -14 removed lines

@@ -24,38 +24,38 @@
      * @return $this
      * @throws QueryException
      */
-    public function limit($limit = 0, $offset = null)
+    public function limit( $limit = 0, $offset = null )
     {
-        $limit = trim($limit);
+        $limit = trim( $limit );
 
-        if (!QueryHelper::isInteger($limit))
-            throw new QueryException('Invalid Limit value', QueryException::QUERY_ERROR_INVALID_LIMIT);
+        if ( !QueryHelper::isInteger( $limit ) )
+            throw new QueryException( 'Invalid Limit value', QueryException::QUERY_ERROR_INVALID_LIMIT );
 
-        if ($limit == 0)
-            throw new QueryException('Invalid Limit zero', QueryException::QUERY_ERROR_INVALID_LIMIT_ZERO);
+        if ( $limit == 0 )
+            throw new QueryException( 'Invalid Limit zero', QueryException::QUERY_ERROR_INVALID_LIMIT_ZERO );
 
-        if (is_null($offset)) {
-            $this->queryStructure->setElement(QueryStructure::LIMIT, $limit);
+        if ( is_null( $offset ) ) {
+            $this->queryStructure->setElement( QueryStructure::LIMIT, $limit );
 
             return $this;
         }
 
-        $offset = trim($offset);
+        $offset = trim( $offset );
 
-        if (!QueryHelper::isInteger($offset))
-            throw new QueryException('Invalid Limit offset', QueryException::QUERY_ERROR_INVALID_LIMIT_OFFSET);
+        if ( !QueryHelper::isInteger( $offset ) )
+            throw new QueryException( 'Invalid Limit offset', QueryException::QUERY_ERROR_INVALID_LIMIT_OFFSET );
 
-        $this->queryStructure->setElement(QueryStructure::LIMIT, $offset . ',' . $limit);
+        $this->queryStructure->setElement( QueryStructure::LIMIT, $offset . ',' . $limit );
 
         return $this;
     }
 
     private function getLimitSyntax()
     {
-        if (!$this->queryStructure->getElement(QueryStructure::LIMIT))
+        if ( !$this->queryStructure->getElement( QueryStructure::LIMIT ) )
             return '';
 
-        return 'LIMIT ' . $this->queryStructure->getElement(QueryStructure::LIMIT);
+        return 'LIMIT ' . $this->queryStructure->getElement( QueryStructure::LIMIT );
     }
 
 }

Braces +12 added lines, -8 removed lines

@@ -28,11 +28,13 @@ 
     {
         $limit = trim($limit);
 
-        if (!QueryHelper::isInteger($limit))
-            throw new QueryException('Invalid Limit value', QueryException::QUERY_ERROR_INVALID_LIMIT);
+        if (!QueryHelper::isInteger($limit)) {
+                    throw new QueryException('Invalid Limit value', QueryException::QUERY_ERROR_INVALID_LIMIT);
+        }
 
-        if ($limit == 0)
-            throw new QueryException('Invalid Limit zero', QueryException::QUERY_ERROR_INVALID_LIMIT_ZERO);
+        if ($limit == 0) {
+                    throw new QueryException('Invalid Limit zero', QueryException::QUERY_ERROR_INVALID_LIMIT_ZERO);
+        }
 
         if (is_null($offset)) {
             $this->queryStructure->setElement(QueryStructure::LIMIT, $limit);
@@ -42,8 +44,9 @@ 
 
         $offset = trim($offset);
 
-        if (!QueryHelper::isInteger($offset))
-            throw new QueryException('Invalid Limit offset', QueryException::QUERY_ERROR_INVALID_LIMIT_OFFSET);
+        if (!QueryHelper::isInteger($offset)) {
+                    throw new QueryException('Invalid Limit offset', QueryException::QUERY_ERROR_INVALID_LIMIT_OFFSET);
+        }
 
         $this->queryStructure->setElement(QueryStructure::LIMIT, $offset . ',' . $limit);
 
@@ -52,8 +55,9 @@ 
 
     private function getLimitSyntax()
     {
-        if (!$this->queryStructure->getElement(QueryStructure::LIMIT))
-            return '';
+        if (!$this->queryStructure->getElement(QueryStructure::LIMIT)) {
+                    return '';
+        }
 
         return 'LIMIT ' . $this->queryStructure->getElement(QueryStructure::LIMIT);
     }

src/Traits/ColumnValidation.php

Indentation +9 added lines, -9 removed lines

@@ -12,18 +12,18 @@
 trait ColumnValidation
 {
 
-    use Objects;
+	use Objects;
 
-    protected function validateColumn($columnName, array $allowed)
-    {
-        if (is_integer($columnName))
-            return true;
+	protected function validateColumn($columnName, array $allowed)
+	{
+		if (is_integer($columnName))
+			return true;
 
-        if (!count($allowed))
-            return true;
+		if (!count($allowed))
+			return true;
 
-        return false;
-    }
+		return false;
+	}
 
 
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -14,12 +14,12 @@
 
     use Objects;
 
-    protected function validateColumn($columnName, array $allowed)
+    protected function validateColumn( $columnName, array $allowed )
     {
-        if (is_integer($columnName))
+        if ( is_integer( $columnName ) )
             return true;
 
-        if (!count($allowed))
+        if ( !count( $allowed ) )
             return true;
 
         return false;

Braces +6 added lines, -4 removed lines

@@ -16,11 +16,13 @@
 
     protected function validateColumn($columnName, array $allowed)
     {
-        if (is_integer($columnName))
-            return true;
+        if (is_integer($columnName)) {
+                    return true;
+        }
 
-        if (!count($allowed))
-            return true;
+        if (!count($allowed)) {
+                    return true;
+        }
 
         return false;
     }

src/Traits/Utilities.php

Indentation +33 added lines, -33 removed lines

@@ -13,48 +13,48 @@
 trait Utilities
 {
 
-    use Objects;
+	use Objects;
 
 
-    /**
-     * @return $this
-     */
-    public function explain()
-    {
-        $this->queryStructure->setElement(QueryStructure::EXPLAIN, 1);
+	/**
+	 * @return $this
+	 */
+	public function explain()
+	{
+		$this->queryStructure->setElement(QueryStructure::EXPLAIN, 1);
 
-        return $this;
-    }
+		return $this;
+	}
 
-    protected function getExplainSyntax()
-    {
-        if ($this->queryStructure->getElement(QueryStructure::EXPLAIN))
-            return 'EXPLAIN';
+	protected function getExplainSyntax()
+	{
+		if ($this->queryStructure->getElement(QueryStructure::EXPLAIN))
+			return 'EXPLAIN';
 
-        return '';
-    }
+		return '';
+	}
 
 
-    /**
-     * @param string $comment
-     * @return $this
-     */
-    public function withComment($comment = '')
-    {
-        $this->queryStructure->setElement(QueryStructure::QUERY_COMMENT, $comment);
+	/**
+	 * @param string $comment
+	 * @return $this
+	 */
+	public function withComment($comment = '')
+	{
+		$this->queryStructure->setElement(QueryStructure::QUERY_COMMENT, $comment);
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * @param string $identifier
-     * @return $this
-     */
-    public function withLogIdentifier($identifier = null)
-    {
-        $this->queryStructure->setElement(QueryStructure::QUERY_IDENTIFIER, $identifier);
+	/**
+	 * @param string $identifier
+	 * @return $this
+	 */
+	public function withLogIdentifier($identifier = null)
+	{
+		$this->queryStructure->setElement(QueryStructure::QUERY_IDENTIFIER, $identifier);
 
-        return $this;
-    }
+		return $this;
+	}
 
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -21,14 +21,14 @@ 
      */
     public function explain()
     {
-        $this->queryStructure->setElement(QueryStructure::EXPLAIN, 1);
+        $this->queryStructure->setElement( QueryStructure::EXPLAIN, 1 );
 
         return $this;
     }
 
     protected function getExplainSyntax()
     {
-        if ($this->queryStructure->getElement(QueryStructure::EXPLAIN))
+        if ( $this->queryStructure->getElement( QueryStructure::EXPLAIN ) )
             return 'EXPLAIN';
 
         return '';
@@ -39,9 +39,9 @@ 
      * @param string $comment
      * @return $this
      */
-    public function withComment($comment = '')
+    public function withComment( $comment = '' )
     {
-        $this->queryStructure->setElement(QueryStructure::QUERY_COMMENT, $comment);
+        $this->queryStructure->setElement( QueryStructure::QUERY_COMMENT, $comment );
 
         return $this;
     }
@@ -50,9 +50,9 @@ 
      * @param string $identifier
      * @return $this
      */
-    public function withLogIdentifier($identifier = null)
+    public function withLogIdentifier( $identifier = null )
     {
-        $this->queryStructure->setElement(QueryStructure::QUERY_IDENTIFIER, $identifier);
+        $this->queryStructure->setElement( QueryStructure::QUERY_IDENTIFIER, $identifier );
 
         return $this;
     }

Braces +3 added lines, -2 removed lines

@@ -28,8 +28,9 @@
 
     protected function getExplainSyntax()
     {
-        if ($this->queryStructure->getElement(QueryStructure::EXPLAIN))
-            return 'EXPLAIN';
+        if ($this->queryStructure->getElement(QueryStructure::EXPLAIN)) {
+                    return 'EXPLAIN';
+        }
 
         return '';
     }