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

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	 */
 	public function setField( $fieldName, $fieldValue )
 	{
-		$fieldName = $this->queryStructure->prepare($fieldName);
+		$fieldName = $this->queryStructure->prepare( $fieldName );
 		$valuePdoString = $this->queryStructure->bindParam( $fieldName, $fieldValue );
 		$this->queryStructure->setElement( QueryStructure::SET_FIELDS, "$fieldName = $valuePdoString" );
 

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/DB/DbConnect.php

Braces +12 added lines, -8 removed lines

@@ -42,8 +42,9 @@ 
 	 */
 	public function getMasterConnection()
 	{
-		if ( !is_a( $this->pdoMaster, \PDO::class ) )
-			$this->pdoMaster = $this->connect( $this->config->getMasterDataConnect() );
+		if ( !is_a( $this->pdoMaster, \PDO::class ) ) {
+					$this->pdoMaster = $this->connect( $this->config->getMasterDataConnect() );
+		}
 
 		return $this->pdoMaster;
 	}
@@ -53,11 +54,13 @@ 
 	 */
 	public function getSlaveConnection()
 	{
-		if ( !$this->config->getReplicationEnable() )
-			return $this->getMasterConnection();
+		if ( !$this->config->getReplicationEnable() ) {
+					return $this->getMasterConnection();
+		}
 
-		if ( !is_a( $this->pdoSlave, \PDO::class ) )
-			$this->pdoSlave = $this->connect( $this->config->getSlaveDataConnect() );
+		if ( !is_a( $this->pdoSlave, \PDO::class ) ) {
+					$this->pdoSlave = $this->connect( $this->config->getSlaveDataConnect() );
+		}
 
 		return $this->pdoSlave;
 	}
@@ -70,8 +73,9 @@ 
 	{
 		$statement = trim( strtolower( $statement ) );
 
-		if ( $statement === DbService::QUERY_TYPE_SELECT )
-			return $this->getSlaveConnection();
+		if ( $statement === DbService::QUERY_TYPE_SELECT ) {
+					return $this->getSlaveConnection();
+		}
 
 		return $this->getMasterConnection();
 	}

src/Statements/QuerySelect.php

Braces +9 added lines, -6 removed lines

@@ -55,8 +55,9 @@ 
 			$this->queryStructure->setElement( QueryStructure::TABLE, $tableName );
 
 			$tableSelectParams = $table->getBindParams();
-			foreach ( $tableSelectParams as $key => $value )
-				$this->queryStructure->setParams( $key, $value );
+			foreach ( $tableSelectParams as $key => $value ) {
+							$this->queryStructure->setParams( $key, $value );
+			}
 
 		}
 	}
@@ -107,8 +108,9 @@ 
 			$this->queryStructure->setElement( QueryStructure::DISTINCT, 0 ); //???
 		}
 
-		if ( $this->queryStructure->getElement( QueryStructure::FIRST ) )
-			$this->queryStructure->setElement( QueryStructure::LIMIT, 1 );
+		if ( $this->queryStructure->getElement( QueryStructure::FIRST ) ) {
+					$this->queryStructure->setElement( QueryStructure::LIMIT, 1 );
+		}
 
 		$syntax = array();
 
@@ -190,8 +192,9 @@ 
 				return DbService::getInstance()->single( $this->getSyntax(), $this->queryStructure->getElement( QueryStructure::BIND_PARAMS ) );
 				break;
 			case $this->queryStructure->getElement( QueryStructure::FIRST ):
-				if ( $this->queryStructure->getElement( QueryStructure::COLUMN ) )
-					return DbService::getInstance()->single( $this->getSyntax(), $this->queryStructure->getElement( QueryStructure::BIND_PARAMS ) );
+				if ( $this->queryStructure->getElement( QueryStructure::COLUMN ) ) {
+									return DbService::getInstance()->single( $this->getSyntax(), $this->queryStructure->getElement( QueryStructure::BIND_PARAMS ) );
+				}
 
 				return DbService::getInstance()->row( $this->getSyntax(), $this->queryStructure->getElement( QueryStructure::BIND_PARAMS ) );
 				break;

Spacing +12 added lines, -12 removed lines

@@ -115,62 +115,62 @@
 		/**
 		 *  Explain
 		 */
-		$syntax[] = $this->getExplainSyntax();
+		$syntax[ ] = $this->getExplainSyntax();
 
 		/**
 		 * SELECT statement
 		 */
-		$syntax[] = $this->statement;
+		$syntax[ ] = $this->statement;
 
 		/**
 		 * PRIORITY
 		 */
-		$syntax[] = $this->queryStructure->getElement( QueryStructure::PRIORITY );
+		$syntax[ ] = $this->queryStructure->getElement( QueryStructure::PRIORITY );
 
 		/**
 		 * DISTINCT clause
 		 */
-		$syntax[] = $this->getDistinctSyntax();
+		$syntax[ ] = $this->getDistinctSyntax();
 
 		/**
 		 * FIELDS
 		 */
-		$syntax[] = $this->queryStructure->getElement( QueryStructure::FIELDS );
+		$syntax[ ] = $this->queryStructure->getElement( QueryStructure::FIELDS );
 
 		/**
 		 * FROM table or queryStructure
 		 */
-		$syntax[] = 'FROM ' . $this->queryStructure->getElement( QueryStructure::TABLE );
+		$syntax[ ] = 'FROM ' . $this->queryStructure->getElement( QueryStructure::TABLE );
 
 		/**
 		 * JOIN CLAUSES
 		 */
-		$syntax[] = $this->getJoinSyntax();
+		$syntax[ ] = $this->getJoinSyntax();
 
 		/**
 		 * WHERE clause
 		 */
-		$syntax[] = $this->getWhereSyntax();
+		$syntax[ ] = $this->getWhereSyntax();
 
 		/**
 		 * GROUP BY clause
 		 */
-		$syntax[] = $this->getGroupBySyntax();
+		$syntax[ ] = $this->getGroupBySyntax();
 
 		/**
 		 * HAVING clause
 		 */
-		$syntax[] = $this->getHavingSyntax();
+		$syntax[ ] = $this->getHavingSyntax();
 
 		/**
 		 * ORDER BY clause
 		 */
-		$syntax[] = $this->getOrderBySyntax();
+		$syntax[ ] = $this->getOrderBySyntax();
 
 		/**
 		 * LIMIT clause
 		 */
-		$syntax[] = $this->getLimitSyntax();
+		$syntax[ ] = $this->getLimitSyntax();
 
 		$syntax = implode( ' ', $syntax );