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

src/Traits/GroupBy.php

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 GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
+		if ( !$this->validateColumn( $column, $allowedColumns ) ) {
+					throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
+		}
 
 		$this->queryStructure->setElement( QueryStructure::GROUP_BY, $column );
 
@@ -47,8 +48,9 @@ 
 	{
 		$column = trim( $column );
 
-		if ( !$this->validateColumn( $column, $allowedColumns ) )
-			throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
+		if ( !$this->validateColumn( $column, $allowedColumns ) ) {
+					throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
+		}
 
 		$this->queryStructure->setElement( QueryStructure::GROUP_BY, $column . ' DESC' );
 
@@ -73,8 +75,9 @@ 
 	 */
 	private function getGroupBySyntax()
 	{
-		if ( count( $this->queryStructure->getElement( QueryStructure::GROUP_BY ) ) )
-			return 'GROUP BY ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::GROUP_BY ), ', ' );
+		if ( count( $this->queryStructure->getElement( QueryStructure::GROUP_BY ) ) ) {
+					return 'GROUP BY ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::GROUP_BY ), ', ' );
+		}
 
 		return '';
 	}

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 	 * @return $this
 	 * @throws QueryException
 	 */
-	public function groupBy( $column, array $allowedColumns = [] )
+	public function groupBy( $column, array $allowedColumns = [ ] )
 	{
 		$column = trim( $column );
 
@@ -43,7 +43,7 @@ 
 	 * @return $this
 	 * @throws QueryException
 	 */
-	public function groupByDesc( $column, array $allowedColumns = [] )
+	public function groupByDesc( $column, array $allowedColumns = [ ] )
 	{
 		$column = trim( $column );
 

src/Dependencies/QueryStructure.php

Braces +23 added lines, -16 removed lines

@@ -85,8 +85,9 @@ 
 	{
 		$this->syntaxEL = $this->init();
 
-		foreach ( $this->syntaxEL as $name => $value )
-			$this->typeEL[ $name ] = gettype( $value );
+		foreach ( $this->syntaxEL as $name => $value ) {
+					$this->typeEL[ $name ] = gettype( $value );
+		}
 
 	}
 
@@ -172,16 +173,19 @@ 
 	 */
 	public function setElement( $name, $value )
 	{
-		if ( !array_key_exists( $name, $this->syntaxEL ) )
-			throw new QueryException( 'Invalid Query property', QueryException::QUERY_ERROR_ELEMENT_NOT_FOUND );
+		if ( !array_key_exists( $name, $this->syntaxEL ) ) {
+					throw new QueryException( 'Invalid Query property', QueryException::QUERY_ERROR_ELEMENT_NOT_FOUND );
+		}
 
-		if ( $name == self::TABLE && is_a( $value, QueryStatement::class ) )
-			return true;
+		if ( $name == self::TABLE && is_a( $value, QueryStatement::class ) ) {
+					return true;
+		}
 
-		if ( $this->typeEL[ $name ] === self::ELEMENT_TYPE_ARRAY )
-			$this->syntaxEL[ $name ][] = $value;
-		else
-			$this->syntaxEL[ $name ] = $value;
+		if ( $this->typeEL[ $name ] === self::ELEMENT_TYPE_ARRAY ) {
+					$this->syntaxEL[ $name ][] = $value;
+		} else {
+					$this->syntaxEL[ $name ] = $value;
+		}
 
 		return true;
 	}
@@ -194,8 +198,9 @@ 
 	 */
 	public function replaceElement( $elementName, $elementValue )
 	{
-		if ( !array_key_exists( $elementName, $this->syntaxEL ) )
-			throw new QueryException( 'Invalid Query property', QueryException::QUERY_ERROR_ELEMENT_NOT_FOUND );
+		if ( !array_key_exists( $elementName, $this->syntaxEL ) ) {
+					throw new QueryException( 'Invalid Query property', QueryException::QUERY_ERROR_ELEMENT_NOT_FOUND );
+		}
 
 		$this->syntaxEL[ $elementName ] = $elementValue;
 	}
@@ -243,11 +248,13 @@ 
 	 */
 	public function bindParamsExpression( $expression, array $params = [], $search = '?' )
 	{
-		if ( !count( $params ) )
-			return $expression;
+		if ( !count( $params ) ) {
+					return $expression;
+		}
 
-		if ( strpos( $expression, $search ) === false )
-			return $expression;
+		if ( strpos( $expression, $search ) === false ) {
+					return $expression;
+		}
 
 		$params = array_slice( $params, 0, substr_count( $expression, $search ) );
 

Spacing +7 added lines, -7 removed lines

@@ -60,7 +60,7 @@ 
 	/**
 	 * @var array
 	 */
-	private static $usedInstanceIds = [];
+	private static $usedInstanceIds = [ ];
 
 	/**
 	 * @var array
@@ -132,7 +132,7 @@ 
 		while ( in_array( $instance, self::$usedInstanceIds ) ) {
 			$instance = QueryHelper::random( 7 );
 		}
-		self::$usedInstanceIds[] = $instance;
+		self::$usedInstanceIds[ ] = $instance;
 
 		return $instance;
 	}
@@ -179,7 +179,7 @@ 
 			return true;
 
 		if ( $this->typeEL[ $name ] === self::ELEMENT_TYPE_ARRAY )
-			$this->syntaxEL[ $name ][] = $value;
+			$this->syntaxEL[ $name ][ ] = $value;
 		else
 			$this->syntaxEL[ $name ] = $value;
 
@@ -241,7 +241,7 @@ 
 	 * @param string $search
 	 * @return string
 	 */
-	public function bindParamsExpression( $expression, array $params = [], $search = '?' )
+	public function bindParamsExpression( $expression, array $params = [ ], $search = '?' )
 	{
 		if ( !count( $params ) )
 			return $expression;
@@ -252,12 +252,12 @@ 
 		$params = array_slice( $params, 0, substr_count( $expression, $search ) );
 
 		$i = 0;
-		$arrayReturn = [];
+		$arrayReturn = [ ];
 		$expressionToArray = explode( $search, $expression );
 
 		foreach ( $expressionToArray as $sub ) {
-			$arrayReturn[] = $sub;
-			$arrayReturn[] = array_key_exists( $i, $params ) ? $this->bindParam( 'exp', $params[ $i ] ) : '';
+			$arrayReturn[ ] = $sub;
+			$arrayReturn[ ] = array_key_exists( $i, $params ) ? $this->bindParam( 'exp', $params[ $i ] ) : '';
 			$i++;
 		}