adumitru68 / QueryBuilder

src/Traits/InsertMultiple.php

Spacing +26 added lines, -26 removed lines

@@ -25,12 +25,12 @@ 
 	 * @param array $rowsForInsert
 	 * @return $this
 	 */
-	public function fromArray( $fieldsList, array $rowsForInsert )
+	public function fromArray($fieldsList, array $rowsForInsert)
 	{
-		$this->setFieldsList( $fieldsList );
+		$this->setFieldsList($fieldsList);
 
-		foreach ( $rowsForInsert as $row )
-			$this->addSingleRow( $row );
+		foreach ($rowsForInsert as $row)
+			$this->addSingleRow($row);
 
 		return $this;
 	}
@@ -41,14 +41,14 @@ 
 	 * @param QuerySelect $query
 	 * @return $this
 	 */
-	public function fromQuerySelect( $fieldsList, QuerySelect $query )
+	public function fromQuerySelect($fieldsList, QuerySelect $query)
 	{
-		$this->setFieldsList( $fieldsList );
+		$this->setFieldsList($fieldsList);
 
-		foreach ( $query->getBindParams() as $key => $value )
-			$this->queryStructure->setParams( $key, $value );
+		foreach ($query->getBindParams() as $key => $value)
+			$this->queryStructure->setParams($key, $value);
 
-		$this->queryStructure->replaceElement( QueryStructure::SET_FIELDS, $query );
+		$this->queryStructure->replaceElement(QueryStructure::SET_FIELDS, $query);
 
 		return $this;
 	}
@@ -57,12 +57,12 @@ 
 	/**
 	 * @param string|array $fieldList
 	 */
-	private function setFieldsList( $fieldList )
+	private function setFieldsList($fieldList)
 	{
-		if ( !is_array( $fieldList ) )
-			$fieldList = QueryHelper::explode( $fieldList );
+		if (!is_array($fieldList))
+			$fieldList = QueryHelper::explode($fieldList);
 
-		$this->queryStructure->replaceElement( QueryStructure::FIELDS, $fieldList );
+		$this->queryStructure->replaceElement(QueryStructure::FIELDS, $fieldList);
 
 	}
 
@@ -71,20 +71,20 @@ 
 	 * @return $this
 	 * @throws QueryException
 	 */
-	private function addSingleRow( array $rowValues )
+	private function addSingleRow(array $rowValues)
 	{
 
-		if ( $this->getNumberOfFields() !== count( $rowValues ) )
-			throw new QueryException( 'Ivalid number of fields.', QueryException::QUERY_ERROR_INVALID_FIELDS_COUNT );
+		if ($this->getNumberOfFields() !== count($rowValues))
+			throw new QueryException('Ivalid number of fields.', QueryException::QUERY_ERROR_INVALID_FIELDS_COUNT);
 
 		$pdoRowValues = array();
 
-		foreach ( $rowValues as $value )
-			$pdoRowValues[] = $this->queryStructure->bindParam( 'value', $value );
+		foreach ($rowValues as $value)
+			$pdoRowValues[] = $this->queryStructure->bindParam('value', $value);
 
-		$pdoRowValuesString = '( ' . QueryHelper::implode( $pdoRowValues, ', ' ) . ' )';
+		$pdoRowValuesString = '( ' . QueryHelper::implode($pdoRowValues, ', ') . ' )';
 
-		$this->queryStructure->setElement( QueryStructure::SET_FIELDS, $pdoRowValuesString );
+		$this->queryStructure->setElement(QueryStructure::SET_FIELDS, $pdoRowValuesString);
 
 		return $this;
 	}
@@ -94,11 +94,11 @@ 
 	 */
 	private function getInsertMultipleRowsSyntax()
 	{
-		if ( is_a( $this->queryStructure->getElement( QueryStructure::SET_FIELDS ), QuerySelect::class ) )
+		if (is_a($this->queryStructure->getElement(QueryStructure::SET_FIELDS), QuerySelect::class))
 			return $this->getSyntaxWithSelect();
 
-		$fields = '( ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::FIELDS ), ', ' ) . ' )';
-		$values = QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::SET_FIELDS ), ', ' );
+		$fields = '( ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::FIELDS), ', ') . ' )';
+		$values = QueryHelper::implode($this->queryStructure->getElement(QueryStructure::SET_FIELDS), ', ');
 
 		return $fields . ' VALUES ' . $values;
 	}
@@ -109,9 +109,9 @@ 
 	 */
 	private function getSyntaxWithSelect()
 	{
-		$fields = '( ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::FIELDS ), ', ' ) . ' )';
+		$fields = '( ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::FIELDS), ', ') . ' )';
 
-		return $fields . ' ' . $this->queryStructure->getElement( QueryStructure::SET_FIELDS )->getSyntax();
+		return $fields . ' ' . $this->queryStructure->getElement(QueryStructure::SET_FIELDS)->getSyntax();
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 */
 	private function getNumberOfFields()
 	{
-		return count( $this->queryStructure->getElement( QueryStructure::FIELDS ) );
+		return count($this->queryStructure->getElement(QueryStructure::FIELDS));
 	}
 
 

Braces +18 added lines, -12 removed lines

@@ -29,8 +29,9 @@ 
 	{
 		$this->setFieldsList( $fieldsList );
 
-		foreach ( $rowsForInsert as $row )
-			$this->addSingleRow( $row );
+		foreach ( $rowsForInsert as $row ) {
+					$this->addSingleRow( $row );
+		}
 
 		return $this;
 	}
@@ -45,8 +46,9 @@ 
 	{
 		$this->setFieldsList( $fieldsList );
 
-		foreach ( $query->getBindParams() as $key => $value )
-			$this->queryStructure->setParams( $key, $value );
+		foreach ( $query->getBindParams() as $key => $value ) {
+					$this->queryStructure->setParams( $key, $value );
+		}
 
 		$this->queryStructure->replaceElement( QueryStructure::SET_FIELDS, $query );
 
@@ -59,8 +61,9 @@ 
 	 */
 	private function setFieldsList( $fieldList )
 	{
-		if ( !is_array( $fieldList ) )
-			$fieldList = QueryHelper::explode( $fieldList );
+		if ( !is_array( $fieldList ) ) {
+					$fieldList = QueryHelper::explode( $fieldList );
+		}
 
 		$this->queryStructure->replaceElement( QueryStructure::FIELDS, $fieldList );
 
@@ -74,13 +77,15 @@ 
 	private function addSingleRow( array $rowValues )
 	{
 
-		if ( $this->getNumberOfFields() !== count( $rowValues ) )
-			throw new QueryException( 'Ivalid number of fields.', QueryException::QUERY_ERROR_INVALID_FIELDS_COUNT );
+		if ( $this->getNumberOfFields() !== count( $rowValues ) ) {
+					throw new QueryException( 'Ivalid number of fields.', QueryException::QUERY_ERROR_INVALID_FIELDS_COUNT );
+		}
 
 		$pdoRowValues = array();
 
-		foreach ( $rowValues as $value )
-			$pdoRowValues[] = $this->queryStructure->bindParam( 'value', $value );
+		foreach ( $rowValues as $value ) {
+					$pdoRowValues[] = $this->queryStructure->bindParam( 'value', $value );
+		}
 
 		$pdoRowValuesString = '( ' . QueryHelper::implode( $pdoRowValues, ', ' ) . ' )';
 
@@ -94,8 +99,9 @@ 
 	 */
 	private function getInsertMultipleRowsSyntax()
 	{
-		if ( is_a( $this->queryStructure->getElement( QueryStructure::SET_FIELDS ), QuerySelect::class ) )
-			return $this->getSyntaxWithSelect();
+		if ( is_a( $this->queryStructure->getElement( QueryStructure::SET_FIELDS ), QuerySelect::class ) ) {
+					return $this->getSyntaxWithSelect();
+		}
 
 		$fields = '( ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::FIELDS ), ', ' ) . ' )';
 		$values = QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::SET_FIELDS ), ', ' );

src/Traits/WhereAndHavingBuilder.php

Spacing +40 added lines, -40 removed lines

@@ -26,22 +26,22 @@ 
 	 * @param $clauseType
 	 * @return $this
 	 */
-	protected function createCondition( $param, $glue = 'AND', $clauseType )
+	protected function createCondition($param, $glue = 'AND', $clauseType)
 	{
 
-		if ( !is_array( $param ) ) {
-			$this->queryStructure->setElement( $clauseType, array( 'glue' => $glue, 'body' => trim( $param ), 'type' => 'cond' ) );
+		if (!is_array($param)) {
+			$this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => trim($param), 'type' => 'cond'));
 
 			return $this;
 		}
 
-		$param = $this->validateWhereParam( $param );
+		$param = $this->validateWhereParam($param);
 
 		$field = $param[0];
 		$value = $param[1];
 		$operator = $param[2];
 
-		switch ( $operator ) {
+		switch ($operator) {
 			case 'BETWEEN':
 			case 'NOT BETWEEN':
 			case '!BETWEEN':
@@ -50,27 +50,27 @@ 
 				$body = [
 					$field,
 					$operator,
-					$this->queryStructure->bindParam( 'min', $min ),
+					$this->queryStructure->bindParam('min', $min),
 					'AND',
-					$this->queryStructure->bindParam( 'max', $max )
+					$this->queryStructure->bindParam('max', $max)
 				];
-				$body = implode( ' ', $body );
-				$this->queryStructure->setElement( $clauseType, array( 'glue' => $glue, 'body' => $body, 'type' => 'cond' ) );
+				$body = implode(' ', $body);
+				$this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
 				break;
 
 			case 'IN':
 			case 'NOT IN':
 			case '!IN':
-				if ( is_a( $value, QuerySelect::class ) )
-					return $this->inSelectObject( $field, $value, $operator, $glue, $clauseType );
-				elseif ( is_array( $value ) )
-					return $this->inArray( $field, $value, $operator, $glue, $clauseType );
+				if (is_a($value, QuerySelect::class))
+					return $this->inSelectObject($field, $value, $operator, $glue, $clauseType);
+				elseif (is_array($value))
+					return $this->inArray($field, $value, $operator, $glue, $clauseType);
 				break;
 
 			default:
-				$valuePdoString = $this->queryStructure->bindParam( $field, $value );
+				$valuePdoString = $this->queryStructure->bindParam($field, $value);
 				$body = $field . ' ' . $operator . ' ' . $valuePdoString;
-				$this->queryStructure->setElement( $clauseType, array( 'glue' => $glue, 'body' => $body, 'type' => 'cond' ) );
+				$this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
 
 		}
 
@@ -87,11 +87,11 @@ 
 	 * @param $clauseType
 	 * @return $this
 	 */
-	private function inSelectObject( $field, QuerySelect $subquerySelect, $operator, $glue = 'AND', $clauseType )
+	private function inSelectObject($field, QuerySelect $subquerySelect, $operator, $glue = 'AND', $clauseType)
 	{
 		$subquerySelectParams = $subquerySelect->getBindParams();
-		foreach ( $subquerySelectParams as $key => $value ) {
-			$this->queryStructure->setParams( $key, $value );
+		foreach ($subquerySelectParams as $key => $value) {
+			$this->queryStructure->setParams($key, $value);
 		}
 		$body = [
 			$field,
@@ -100,8 +100,8 @@ 
 			$subquerySelect->getSyntax(),
 			' )'
 		];
-		$body = implode( ' ', $body );
-		$this->queryStructure->setElement( $clauseType, array( 'glue' => $glue, 'body' => $body, 'type' => 'cond' ) );
+		$body = implode(' ', $body);
+		$this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
 
 		return $this;
 	}
@@ -114,20 +114,20 @@ 
 	 * @param $clauseType
 	 * @return $this
 	 */
-	private function inArray( $field, array $value, $operator, $glue, $clauseType )
+	private function inArray($field, array $value, $operator, $glue, $clauseType)
 	{
 		$pdoArray = array();
-		foreach ( $value as $item ) {
-			$pdoArray[] = $this->queryStructure->bindParam( 'a', $item );
+		foreach ($value as $item) {
+			$pdoArray[] = $this->queryStructure->bindParam('a', $item);
 		}
 		$body = [
 			$field,
 			$operator,
-			'( ' . implode( ', ', $pdoArray ) . ' )'
+			'( ' . implode(', ', $pdoArray) . ' )'
 		];
-		$body = implode( ' ', $body );
-		$body = QueryHelper::clearMultipleSpaces( $body );
-		$this->queryStructure->setElement( $clauseType, array( 'glue' => $glue, 'body' => $body, 'type' => 'cond' ) );
+		$body = implode(' ', $body);
+		$body = QueryHelper::clearMultipleSpaces($body);
+		$this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
 
 		return $this;
 	}
@@ -146,36 +146,36 @@ 
 	 */
 	private function getHavingSyntax()
 	{
-		return $this->getWhereAndHavingSyntax( QueryStructure::HAVING);
+		return $this->getWhereAndHavingSyntax(QueryStructure::HAVING);
 	}
 
 	/**
 	 * @param $clauseType
 	 * @return bool|mixed|string
 	 */
-	private function getWhereAndHavingSyntax( $clauseType )
+	private function getWhereAndHavingSyntax($clauseType)
 	{
-		if ( count( $this->queryStructure->getElement( $clauseType ) ) == 0 )
+		if (count($this->queryStructure->getElement($clauseType)) == 0)
 			return '';
 
 		$where = '';
 		$last_type = 'where_start';
-		foreach ( $this->queryStructure->getElement( $clauseType ) as $where_cond ) {
+		foreach ($this->queryStructure->getElement($clauseType) as $where_cond) {
 			$glue = $where_cond['glue'];
-			if ( $last_type == 'where_start' || $last_type == 'start_where_group' ) {
+			if ($last_type == 'where_start' || $last_type == 'start_where_group') {
 				$glue = '';
 			}
 			$where .= ' ' . $glue . ' ' . $where_cond['body'];
 			$last_type = $where_cond['type'];
 		}
 
-		if ( $this->queryStructure->getElement( $clauseType.'_invert' ) ) {
+		if ($this->queryStructure->getElement($clauseType . '_invert')) {
 			$where = ' NOT ( ' . $where . ' ) ';
 		}
 
 		$where = 'WHERE ' . $where;
 
-		return QueryHelper::clearMultipleSpaces( $where );
+		return QueryHelper::clearMultipleSpaces($where);
 	}
 
 	/**
@@ -183,16 +183,16 @@ 
 	 * @return array
 	 * @throws QueryException
 	 */
-	private function validateWhereParam( $param )
+	private function validateWhereParam($param)
 	{
-		if ( count( $param ) < 2 )
-			throw new QueryException( 'Invalid where array!', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY );
+		if (count($param) < 2)
+			throw new QueryException('Invalid where array!', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY);
 
-		if ( count( $param ) == 2 )
+		if (count($param) == 2)
 			$param[] = '=';
 
-		$param[2] = trim( strtoupper( $param[2] ) );
-		$param[2] = QueryHelper::clearMultipleSpaces( $param[2] );
+		$param[2] = trim(strtoupper($param[2]));
+		$param[2] = QueryHelper::clearMultipleSpaces($param[2]);
 
 		return $param;
 	}

Braces +14 added lines, -10 removed lines

@@ -61,10 +61,11 @@ 
 			case 'IN':
 			case 'NOT IN':
 			case '!IN':
-				if ( is_a( $value, QuerySelect::class ) )
-					return $this->inSelectObject( $field, $value, $operator, $glue, $clauseType );
-				elseif ( is_array( $value ) )
-					return $this->inArray( $field, $value, $operator, $glue, $clauseType );
+				if ( is_a( $value, QuerySelect::class ) ) {
+									return $this->inSelectObject( $field, $value, $operator, $glue, $clauseType );
+				} elseif ( is_array( $value ) ) {
+									return $this->inArray( $field, $value, $operator, $glue, $clauseType );
+				}
 				break;
 
 			default:
@@ -155,8 +156,9 @@ 
 	 */
 	private function getWhereAndHavingSyntax( $clauseType )
 	{
-		if ( count( $this->queryStructure->getElement( $clauseType ) ) == 0 )
-			return '';
+		if ( count( $this->queryStructure->getElement( $clauseType ) ) == 0 ) {
+					return '';
+		}
 
 		$where = '';
 		$last_type = 'where_start';
@@ -185,11 +187,13 @@ 
 	 */
 	private function validateWhereParam( $param )
 	{
-		if ( count( $param ) < 2 )
-			throw new QueryException( 'Invalid where array!', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY );
+		if ( count( $param ) < 2 ) {
+					throw new QueryException( 'Invalid where array!', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY );
+		}
 
-		if ( count( $param ) == 2 )
-			$param[] = '=';
+		if ( count( $param ) == 2 ) {
+					$param[] = '=';
+		}
 
 		$param[2] = trim( strtoupper( $param[2] ) );
 		$param[2] = QueryHelper::clearMultipleSpaces( $param[2] );

src/Traits/Distinct.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	public function all()
 	{
-		$this->queryStructure->setElement( QueryStructure::DISTINCT, 0 );
+		$this->queryStructure->setElement(QueryStructure::DISTINCT, 0);
 
 		return $this;
 	}
@@ -33,7 +33,7 @@ 
 	 */
 	public function distinct()
 	{
-		$this->queryStructure->setElement( QueryStructure::DISTINCT, 1 );
+		$this->queryStructure->setElement(QueryStructure::DISTINCT, 1);
 
 		return $this;
 	}
@@ -43,7 +43,7 @@ 
 	 */
 	public function distinctRow()
 	{
-		$this->queryStructure->setElement( QueryStructure::DISTINCT, 2 );
+		$this->queryStructure->setElement(QueryStructure::DISTINCT, 2);
 
 		return $this;
 	}
@@ -55,9 +55,9 @@ 
 	 */
 	private function getDistinctSyntax()
 	{
-		$useDistinct = $this->queryStructure->getElement( QueryStructure::DISTINCT );
+		$useDistinct = $this->queryStructure->getElement(QueryStructure::DISTINCT);
 
-		switch ( $useDistinct ) {
+		switch ($useDistinct) {
 			case 0:
 				return '';
 				break;
@@ -68,7 +68,7 @@ 
 				return 'DISTINCTROW';
 				break;
 			default:
-				throw new QueryException( 'Invalid distinct type', QueryException::QUERY_ERROR_INVALID_DISTINCT );
+				throw new QueryException('Invalid distinct type', QueryException::QUERY_ERROR_INVALID_DISTINCT);
 		}
 
 	}

src/Traits/SetFields.php

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/Where.php

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,10 +278,10 @@ 
 	 * @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 );
-		return $this->where( $whereString, $glue );
+		$whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
+		return $this->where($whereString, $glue);
 	}
 
 	/**
@@ -289,10 +289,10 @@ 
 	 * @param array $bindParams
 	 * @return $this
 	 */
-	public function orWhereExpression( $whereString, array $bindParams = [] )
+	public function orWhereExpression($whereString, array $bindParams = [])
 	{
-		$whereString = $this->queryStructure->bindParamsExpression( $whereString, $bindParams );
-		return $this->where( $whereString, 'OR' );
+		$whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
+		return $this->where($whereString, 'OR');
 	}
 
 	/**
@@ -300,7 +300,7 @@ 
 	 */
 	public function whereInvertResult()
 	{
-		$this->queryStructure->setElement( QueryStructure::WHERE_INVERT, 1 );
+		$this->queryStructure->setElement(QueryStructure::WHERE_INVERT, 1);
 
 		return $this;
 	}
@@ -309,9 +309,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;
 	}
@@ -321,7 +321,7 @@ 
 	 */
 	public function orWhereGroup()
 	{
-		return $this->whereGroup( 'OR' );
+		return $this->whereGroup('OR');
 	}
 
 	/**
@@ -329,7 +329,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;
 	}
@@ -339,7 +339,7 @@ 
 	 */
 	public function ignoreWhereTrigger()
 	{
-		$this->queryStructure->setElement( QueryStructure::WHERE_TRIGGER, 0 );
+		$this->queryStructure->setElement(QueryStructure::WHERE_TRIGGER, 0);
 
 		return $this;
 	}
@@ -350,9 +350,9 @@ 
 	 * @param string $glue
 	 * @return $this
 	 */
-	private function where( $param, $glue = 'AND' )
+	private function where($param, $glue = 'AND')
 	{
-		return $this->createCondition($param, $glue, QueryStructure::WHERE );
+		return $this->createCondition($param, $glue, QueryStructure::WHERE);
 	}
 
 }
\ No newline at end of file

src/Traits/Ignore.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	 */
 	public function ignore()
 	{
-		$this->queryStructure->setElement( QueryStructure::IGNORE, 1 );
+		$this->queryStructure->setElement(QueryStructure::IGNORE, 1);
 
 		return $this;
 	}

src/Traits/OrderBy.php

Spacing +12 added lines, -12 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 ) )
+		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 ) )
+		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/TableValidation.php

Spacing +16 added lines, -16 removed lines

@@ -17,18 +17,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);
 
 		}
 
@@ -40,26 +40,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 !== self::QUERY_STATEMENT_SELECT )
-			throw new QueryException( 'Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT );
+		if ($this->statement !== self::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

@@ -44,22 +44,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 !== self::QUERY_STATEMENT_SELECT )
-			throw new QueryException( 'Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT );
+		if ( $this->statement !== self::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/Having.php

Spacing +61 added lines, -61 removed lines

@@ -22,9 +22,9 @@ 
 	 * @param $glue
 	 * @return $this
 	 */
-	public function havingEqual( $field, $value, $glue = 'AND' )
+	public function havingEqual($field, $value, $glue = 'AND')
 	{
-		return $this->having( array( $field, $value, '=' ), $glue );
+		return $this->having(array($field, $value, '='), $glue);
 	}
 
 	/**
@@ -32,9 +32,9 @@ 
 	 * @param $value
 	 * @return $this
 	 */
-	public function orHavingEqual( $field, $value )
+	public function orHavingEqual($field, $value)
 	{
-		return $this->having( array( $field, $value, '=' ), 'OR' );
+		return $this->having(array($field, $value, '='), 'OR');
 	}
 
 	/**
@@ -43,9 +43,9 @@ 
 	 * @param string $glue
 	 * @return $this
 	 */
-	public function havingNotEqual( $field, $value, $glue = 'AND' )
+	public function havingNotEqual($field, $value, $glue = 'AND')
 	{
-		return $this->having( array( $field, $value, '<>' ), $glue );
+		return $this->having(array($field, $value, '<>'), $glue);
 	}
 
 	/**
@@ -53,9 +53,9 @@ 
 	 * @param $value
 	 * @return $this
 	 */
-	public function orHavingNotEqual( $field, $value )
+	public function orHavingNotEqual($field, $value)
 	{
-		return $this->having( array( $field, $value, '<>' ), 'OR' );
+		return $this->having(array($field, $value, '<>'), 'OR');
 	}
 
 	/**
@@ -64,9 +64,9 @@ 
 	 * @param string $glue
 	 * @return $this
 	 */
-	public function havingLessThan( $field, $value, $glue = 'AND' )
+	public function havingLessThan($field, $value, $glue = 'AND')
 	{
-		return $this->having( array( $field, $value, '<' ), $glue );
+		return $this->having(array($field, $value, '<'), $glue);
 	}
 
 	/**
@@ -74,9 +74,9 @@ 
 	 * @param $value
 	 * @return $this
 	 */
-	public function orHavingLessThan( $field, $value )
+	public function orHavingLessThan($field, $value)
 	{
-		return $this->having( array( $field, $value, '<' ), 'OR' );
+		return $this->having(array($field, $value, '<'), 'OR');
 	}
 
 	/**
@@ -85,9 +85,9 @@ 
 	 * @param string $glue
 	 * @return $this
 	 */
-	public function havingLessThanOrEqual( $field, $value, $glue = 'AND' )
+	public function havingLessThanOrEqual($field, $value, $glue = 'AND')
 	{
-		return $this->having( array( $field, $value, '<=' ), $glue );
+		return $this->having(array($field, $value, '<='), $glue);
 	}
 
 	/**
@@ -95,9 +95,9 @@ 
 	 * @param $value
 	 * @return $this
 	 */
-	public function orHavingLessThanOrEqual( $field, $value )
+	public function orHavingLessThanOrEqual($field, $value)
 	{
-		return $this->having( array( $field, $value, '<=' ), 'OR' );
+		return $this->having(array($field, $value, '<='), 'OR');
 	}
 
 	/**
@@ -106,9 +106,9 @@ 
 	 * @param string $glue
 	 * @return $this
 	 */
-	public function havingGreaterThan( $field, $value, $glue = 'AND' )
+	public function havingGreaterThan($field, $value, $glue = 'AND')
 	{
-		return $this->having( array( $field, $value, '>' ), $glue );
+		return $this->having(array($field, $value, '>'), $glue);
 	}
 
 	/**
@@ -116,9 +116,9 @@ 
 	 * @param $value
 	 * @return $this
 	 */
-	public function orHavingGreaterThan( $field, $value )
+	public function orHavingGreaterThan($field, $value)
 	{
-		return $this->having( array( $field, $value, '>' ), 'OR' );
+		return $this->having(array($field, $value, '>'), 'OR');
 	}
 
 	/**
@@ -127,9 +127,9 @@ 
 	 * @param string $glue
 	 * @return $this
 	 */
-	public function havingGreaterThanOrEqual( $field, $value, $glue = 'AND' )
+	public function havingGreaterThanOrEqual($field, $value, $glue = 'AND')
 	{
-		return $this->having( array( $field, $value, '>=' ), $glue );
+		return $this->having(array($field, $value, '>='), $glue);
 	}
 
 	/**
@@ -137,9 +137,9 @@ 
 	 * @param $value
 	 * @return $this
 	 */
-	public function orHavingGreaterThanOrEqual( $field, $value )
+	public function orHavingGreaterThanOrEqual($field, $value)
 	{
-		return $this->having( array( $field, $value, '>=' ), 'OR' );
+		return $this->having(array($field, $value, '>='), 'OR');
 	}
 
 	/**
@@ -148,9 +148,9 @@ 
 	 * @param string $glue
 	 * @return $this
 	 */
-	public function havingLike( $field, $value, $glue = 'AND' )
+	public function havingLike($field, $value, $glue = 'AND')
 	{
-		return $this->having( array( $field, $value, 'LIKE' ), $glue );
+		return $this->having(array($field, $value, 'LIKE'), $glue);
 	}
 
 	/**
@@ -158,9 +158,9 @@ 
 	 * @param $value
 	 * @return $this
 	 */
-	public function orHavingLike( $field, $value )
+	public function orHavingLike($field, $value)
 	{
-		return $this->having( array( $field, $value, 'LIKE' ), 'OR' );
+		return $this->having(array($field, $value, 'LIKE'), 'OR');
 	}
 
 	/**
@@ -169,9 +169,9 @@ 
 	 * @param string $glue
 	 * @return $this
 	 */
-	public function havingNotLike( $field, $value, $glue = 'AND' )
+	public function havingNotLike($field, $value, $glue = 'AND')
 	{
-		return $this->having( array( $field, $value, 'NOT LIKE' ), $glue );
+		return $this->having(array($field, $value, 'NOT LIKE'), $glue);
 	}
 
 	/**
@@ -179,9 +179,9 @@ 
 	 * @param $value
 	 * @return $this
 	 */
-	public function orHavingNotLike( $field, $value )
+	public function orHavingNotLike($field, $value)
 	{
-		return $this->having( array( $field, $value, 'NOT LIKE' ), 'OR' );
+		return $this->having(array($field, $value, 'NOT LIKE'), 'OR');
 	}
 
 	/**
@@ -191,9 +191,9 @@ 
 	 * @param string $glue
 	 * @return $this
 	 */
-	public function havingBetween( $field, $min, $max, $glue = 'AND' )
+	public function havingBetween($field, $min, $max, $glue = 'AND')
 	{
-		return $this->having( array( $field, array( $min, $max ), 'BETWEEN' ), $glue );
+		return $this->having(array($field, array($min, $max), 'BETWEEN'), $glue);
 	}
 
 	/**
@@ -202,9 +202,9 @@ 
 	 * @param $max
 	 * @return $this
 	 */
-	public function orHavingBetween( $field, $min, $max )
+	public function orHavingBetween($field, $min, $max)
 	{
-		return $this->having( array( $field, array( $min, $max ), 'BETWEEN' ), 'OR' );
+		return $this->having(array($field, array($min, $max), 'BETWEEN'), 'OR');
 	}
 
 	/**
@@ -214,9 +214,9 @@ 
 	 * @param string $glue
 	 * @return $this
 	 */
-	public function havingNotBetween( $field, $min, $max, $glue = 'AND' )
+	public function havingNotBetween($field, $min, $max, $glue = 'AND')
 	{
-		return $this->having( array( $field, array( $min, $max ), 'NOT BETWEEN' ), $glue );
+		return $this->having(array($field, array($min, $max), 'NOT BETWEEN'), $glue);
 	}
 
 	/**
@@ -225,9 +225,9 @@ 
 	 * @param $max
 	 * @return $this
 	 */
-	public function orHavingNotBetween( $field, $min, $max )
+	public function orHavingNotBetween($field, $min, $max)
 	{
-		return $this->having( array( $field, array( $min, $max ), 'NOT BETWEEN' ), 'OR' );
+		return $this->having(array($field, array($min, $max), 'NOT BETWEEN'), 'OR');
 	}
 
 	/**
@@ -236,9 +236,9 @@ 
 	 * @param string $glue
 	 * @return $this
 	 */
-	public function havingIn( $field, $value, $glue = 'AND' )
+	public function havingIn($field, $value, $glue = 'AND')
 	{
-		return $this->having( array( $field, $value, 'IN' ), $glue );
+		return $this->having(array($field, $value, 'IN'), $glue);
 	}
 
 	/**
@@ -246,9 +246,9 @@ 
 	 * @param $value
 	 * @return $this
 	 */
-	public function orHavingIn( $field, $value )
+	public function orHavingIn($field, $value)
 	{
-		return $this->having( array( $field, $value, 'IN' ), 'OR' );
+		return $this->having(array($field, $value, 'IN'), 'OR');
 	}
 
 	/**
@@ -257,9 +257,9 @@ 
 	 * @param string $glue
 	 * @return $this
 	 */
-	public function havingNotIn( $field, $value, $glue = 'AND' )
+	public function havingNotIn($field, $value, $glue = 'AND')
 	{
-		return $this->having( array( $field, $value, 'NOT IN' ), $glue );
+		return $this->having(array($field, $value, 'NOT IN'), $glue);
 	}
 
 	/**
@@ -267,9 +267,9 @@ 
 	 * @param $value
 	 * @return $this
 	 */
-	public function orHavingNotIn( $field, $value )
+	public function orHavingNotIn($field, $value)
 	{
-		return $this->having( array( $field, $value, 'NOT IN' ), 'OR' );
+		return $this->having(array($field, $value, 'NOT IN'), 'OR');
 	}
 
 	/**
@@ -278,10 +278,10 @@ 
 	 * @param string $glue
 	 * @return $this
 	 */
-	public function havingExpression( $whereString, array $bindParams = [], $glue = 'AND' )
+	public function havingExpression($whereString, array $bindParams = [], $glue = 'AND')
 	{
-		$whereString = $this->queryStructure->bindParamsExpression( $whereString, $bindParams );
-		return $this->having( $whereString, $glue );
+		$whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
+		return $this->having($whereString, $glue);
 	}
 
 	/**
@@ -289,10 +289,10 @@ 
 	 * @param array $bindParams
 	 * @return $this
 	 */
-	public function orHavingExpression( $whereString, array $bindParams = [] )
+	public function orHavingExpression($whereString, array $bindParams = [])
 	{
-		$whereString = $this->queryStructure->bindParamsExpression( $whereString, $bindParams );
-		return $this->having( $whereString, 'OR' );
+		$whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
+		return $this->having($whereString, 'OR');
 	}
 
 	/**
@@ -300,7 +300,7 @@ 
 	 */
 	public function havingInvertResult()
 	{
-		$this->queryStructure->setElement( QueryStructure::HAVING_INVERT, 1 );
+		$this->queryStructure->setElement(QueryStructure::HAVING_INVERT, 1);
 
 		return $this;
 	}
@@ -309,9 +309,9 @@ 
 	 * @param string $glue
 	 * @return $this
 	 */
-	public function havingGroup( $glue = 'AND' )
+	public function havingGroup($glue = 'AND')
 	{
-		$this->queryStructure->setElement( QueryStructure::HAVING, array( 'glue' => $glue, 'body' => '(', 'type' => 'start_where_group' ) );
+		$this->queryStructure->setElement(QueryStructure::HAVING, array('glue' => $glue, 'body' => '(', 'type' => 'start_where_group'));
 
 		return $this;
 	}
@@ -321,7 +321,7 @@ 
 	 */
 	public function orHavingGroup()
 	{
-		return $this->havingGroup( 'OR' );
+		return $this->havingGroup('OR');
 	}
 
 	/**
@@ -329,7 +329,7 @@ 
 	 */
 	public function havingGroupEnd()
 	{
-		$this->queryStructure->setElement( QueryStructure::HAVING, array( 'glue' => '', 'body' => ')', 'type' => 'end_where_group' ) );
+		$this->queryStructure->setElement(QueryStructure::HAVING, array('glue' => '', 'body' => ')', 'type' => 'end_where_group'));
 
 		return $this;
 	}
@@ -339,9 +339,9 @@ 
 	 * @param string $glue
 	 * @return $this
 	 */
-	private function having( $param, $glue = 'AND' )
+	private function having($param, $glue = 'AND')
 	{
-		return $this->createCondition($param, $glue, QueryStructure::HAVING );
+		return $this->createCondition($param, $glue, QueryStructure::HAVING);
 	}
 
 }
\ No newline at end of file