adumitru68 / QueryBuilder

src/Traits/Join.php

Braces +5 added lines, -4 removed lines

@@ -116,10 +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/Limit.php

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

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 '';
 	}

Spacing +2 added lines, -2 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 '';

src/Traits/ColumnValidation.php

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

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
 	{
 		$syntax = QueryHelper::clearMultipleSpaces( $syntax );
 
-		if ( !$withReplacement )
-			return $syntax;
+		if ( !$withReplacement ) {
+					return $syntax;
+		}
 
 		return $this->replaceValues( $syntax );
 	}

Spacing +2 added lines, -2 removed lines

@@ -43,8 +43,8 @@
 		$search = array();
 		$replace = array();
 		foreach ( $bindParams as $key => $value ) {
-			$search[] = ':' . $key;
-			$replace[] = DbConnect::getInstance()->quote( $value );
+			$search[ ] = ':' . $key;
+			$replace[ ] = DbConnect::getInstance()->quote( $value );
 		}
 		$syntax = str_ireplace( $search, $replace, $syntax );
 

src/Traits/SelectFields.php

Braces +16 added lines, -12 removed lines

@@ -30,19 +30,21 @@ 
 
 				$fields = $this->prepareArrayFields( $fields );
 
-				if ( count( $fields ) )
-					$this->queryStructure->setElement( QueryStructure::FIELDS, implode( ', ', $fields ) );
-				else
-					$this->queryStructure->setElement( QueryStructure::FIELDS, '*' );
+				if ( count( $fields ) ) {
+									$this->queryStructure->setElement( QueryStructure::FIELDS, implode( ', ', $fields ) );
+				} else {
+									$this->queryStructure->setElement( QueryStructure::FIELDS, '*' );
+				}
 				break;
 
 			case QueryStructure::ELEMENT_TYPE_STRING:
 
 				$fields = trim( $fields );
-				if ( '' !== $fields )
-					$this->queryStructure->setElement( QueryStructure::FIELDS, $fields );
-				else
-					$this->queryStructure->setElement( QueryStructure::FIELDS, '*' );
+				if ( '' !== $fields ) {
+									$this->queryStructure->setElement( QueryStructure::FIELDS, $fields );
+				} else {
+									$this->queryStructure->setElement( QueryStructure::FIELDS, '*' );
+				}
 				break;
 
 			default:
@@ -63,11 +65,13 @@ 
 		$prepareArray = [];
 
 		foreach ( $fieldsArray as $field ) {
-			if ( gettype( $field ) !== QueryStructure::ELEMENT_TYPE_STRING )
-				throw new QueryException( 'Invalid select field type!', QueryException::QUERY_ERROR_SELECT_INVALID_FIELD );
+			if ( gettype( $field ) !== QueryStructure::ELEMENT_TYPE_STRING ) {
+							throw new QueryException( 'Invalid select field type!', QueryException::QUERY_ERROR_SELECT_INVALID_FIELD );
+			}
 
-			if ( '' !== trim( $field ) )
-				$prepareArray[] = trim( $field );
+			if ( '' !== trim( $field ) ) {
+							$prepareArray[] = trim( $field );
+			}
 		}
 
 		return $prepareArray;

Spacing +2 added lines, -2 removed lines

@@ -60,14 +60,14 @@
 	 */
 	private function prepareArrayFields( $fieldsArray = array() )
 	{
-		$prepareArray = [];
+		$prepareArray = [ ];
 
 		foreach ( $fieldsArray as $field ) {
 			if ( gettype( $field ) !== QueryStructure::ELEMENT_TYPE_STRING )
 				throw new QueryException( 'Invalid select field type!', QueryException::QUERY_ERROR_SELECT_INVALID_FIELD );
 
 			if ( '' !== trim( $field ) )
-				$prepareArray[] = trim( $field );
+				$prepareArray[ ] = trim( $field );
 		}
 
 		return $prepareArray;

src/Traits/InsertMultiple.php

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 ), ', ' );

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 		$pdoRowValues = array();
 
 		foreach ( $rowValues as $value )
-			$pdoRowValues[] = $this->queryStructure->bindParam( 'value', $value );
+			$pdoRowValues[ ] = $this->queryStructure->bindParam( 'value', $value );
 
 		$pdoRowValuesString = '( ' . QueryHelper::implode( $pdoRowValues, ', ' ) . ' )';
 

src/Traits/WhereAndHavingBuilder.php

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] );

Spacing +15 added lines, -15 removed lines

@@ -37,16 +37,16 @@ 
 
 		$param = $this->validateWhereParam( $param );
 
-		$field = $param[0];
-		$value = $param[1];
-		$operator = $param[2];
+		$field = $param[ 0 ];
+		$value = $param[ 1 ];
+		$operator = $param[ 2 ];
 
 		switch ( $operator ) {
 			case 'BETWEEN':
 			case 'NOT BETWEEN':
 			case '!BETWEEN':
-				$min = $value[0];
-				$max = $value[1];
+				$min = $value[ 0 ];
+				$max = $value[ 1 ];
 				$body = [
 					$field,
 					$operator,
@@ -118,7 +118,7 @@ 
 	{
 		$pdoArray = array();
 		foreach ( $value as $item ) {
-			$pdoArray[] = $this->queryStructure->bindParam( 'a', $item );
+			$pdoArray[ ] = $this->queryStructure->bindParam( 'a', $item );
 		}
 		$body = [
 			$field,
@@ -138,7 +138,7 @@ 
 	 */
 	private function getWhereSyntax()
 	{
-		return $this->getWhereAndHavingSyntax(QueryStructure::WHERE);
+		return $this->getWhereAndHavingSyntax( QueryStructure::WHERE );
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	private function getHavingSyntax()
 	{
-		return $this->getWhereAndHavingSyntax( QueryStructure::HAVING);
+		return $this->getWhereAndHavingSyntax( QueryStructure::HAVING );
 	}
 
 	/**
@@ -161,15 +161,15 @@ 
 		$where = '';
 		$last_type = 'where_start';
 		foreach ( $this->queryStructure->getElement( $clauseType ) as $where_cond ) {
-			$glue = $where_cond['glue'];
+			$glue = $where_cond[ 'glue' ];
 			if ( $last_type == 'where_start' || $last_type == 'start_where_group' ) {
 				$glue = '';
 			}
-			$where .= ' ' . $glue . ' ' . $where_cond['body'];
-			$last_type = $where_cond['type'];
+			$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 . ' ) ';
 		}
 
@@ -189,10 +189,10 @@ 
 			throw new QueryException( 'Invalid where array!', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY );
 
 		if ( count( $param ) == 2 )
-			$param[] = '=';
+			$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;
 	}

src/Traits/SetFields.php

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 ) );
 	}