adumitru68 / QueryBuilder

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

src/Statements/QueryUpdate.php

Braces +3 added lines, -2 removed lines

@@ -106,8 +106,9 @@
 	 */
 	public function execute()
 	{
-		if ( $this->queryStructure->getElement( ( QueryStructure::WHERE_TRIGGER ) ) && !count( $this->queryStructure->getElement( QueryStructure::WHERE ) ) )
-			throw new QueryException( 'Where clause is required for this statement!', QueryException::QUERY_ERROR_DELETE_NOT_FILTER );
+		if ( $this->queryStructure->getElement( ( QueryStructure::WHERE_TRIGGER ) ) && !count( $this->queryStructure->getElement( QueryStructure::WHERE ) ) ) {
+					throw new QueryException( 'Where clause is required for this statement!', QueryException::QUERY_ERROR_DELETE_NOT_FILTER );
+		}
 
 		return DbService::getInstance()->query( $this->getSyntax(), $this->queryStructure->getElement( QueryStructure::BIND_PARAMS ) );
 	}

src/Statements/QueryDelete.php

Braces +3 added lines, -2 removed lines

@@ -96,8 +96,9 @@
 	public function execute()
 	{
 
-		if ( $this->queryStructure->getElement( ( QueryStructure::WHERE_TRIGGER ) ) && !count( $this->queryStructure->getElement( QueryStructure::WHERE ) ) )
-			throw new QueryException( 'Where or Having clause is required for this statement!', QueryException::QUERY_ERROR_DELETE_NOT_FILTER );
+		if ( $this->queryStructure->getElement( ( QueryStructure::WHERE_TRIGGER ) ) && !count( $this->queryStructure->getElement( QueryStructure::WHERE ) ) ) {
+					throw new QueryException( 'Where or Having clause is required for this statement!', QueryException::QUERY_ERROR_DELETE_NOT_FILTER );
+		}
 
 		return DbService::getInstance()->query( $this->getSyntax(), $this->queryStructure->getElement( QueryStructure::BIND_PARAMS ) );
 

src/DB/DbService.php

Braces +25 added lines, -22 removed lines

@@ -117,8 +117,9 @@ 
 	{
 		$this->queryInit( $query, $params );
 
-		if ( $this->lastStatement === self::QUERY_TYPE_EXPLAIN )
-			return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC );
+		if ( $this->lastStatement === self::QUERY_TYPE_EXPLAIN ) {
+					return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC );
+		}
 
 		$Columns = $this->sQuery->fetchAll( \PDO::FETCH_NUM );
 
@@ -141,8 +142,9 @@ 
 	{
 		$this->queryInit( $query, $params );
 
-		if ( $this->lastStatement === self::QUERY_TYPE_EXPLAIN )
-			return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC );
+		if ( $this->lastStatement === self::QUERY_TYPE_EXPLAIN ) {
+					return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC );
+		}
 
 		$result = $this->sQuery->fetch( $fetchmode );
 		$this->sQuery->closeCursor(); // Frees up the connection to the server so that other SQL statements may be issued,
@@ -159,8 +161,9 @@ 
 	{
 		$this->queryInit( $query, $params );
 
-		if ( $this->lastStatement === self::QUERY_TYPE_EXPLAIN )
-			return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC );
+		if ( $this->lastStatement === self::QUERY_TYPE_EXPLAIN ) {
+					return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC );
+		}
 
 		$result = $this->sQuery->fetchColumn();
 		$this->sQuery->closeCursor(); // Frees up the connection to the server so that other SQL statements may be issued
@@ -242,11 +245,12 @@ 
 
 	private function prepareParams( array $parameters )
 	{
-		if ( self::isArrayAssoc( $parameters ) )
-			$this->bindMore( $parameters );
-		else
-			foreach ( $parameters as $key => $val )
+		if ( self::isArrayAssoc( $parameters ) ) {
+					$this->bindMore( $parameters );
+		} else {
+					foreach ( $parameters as $key => $val )
 				$this->parameters[] = array( $key + 1, $val );
+		}
 	}
 
 	private function pdoBindValues()
@@ -254,14 +258,11 @@ 
 		foreach ( $this->parameters as $param => $value ) {
 			if ( is_int( $value[ 1 ] ) ) {
 				$type = \PDO::PARAM_INT;
-			}
-			elseif ( is_bool( $value[ 1 ] ) ) {
+			} elseif ( is_bool( $value[ 1 ] ) ) {
 				$type = \PDO::PARAM_BOOL;
-			}
-			elseif ( is_null( $value[ 1 ] ) ) {
+			} elseif ( is_null( $value[ 1 ] ) ) {
 				$type = \PDO::PARAM_NULL;
-			}
-			else {
+			} else {
 				$type = \PDO::PARAM_STR;
 			}
 			$this->sQuery->bindValue( $value[ 0 ], $value[ 1 ], $type );
@@ -305,10 +306,11 @@ 
 	{
 		$queryString = trim( $queryString );
 
-		if ( preg_match( '/^(select|insert|update|delete|replace|show|desc|explain)[\s]+/i', $queryString, $matches ) )
-			return strtoupper( $matches[ 1 ] );
-		else
-			return self::QUERY_TYPE_OTHER;
+		if ( preg_match( '/^(select|insert|update|delete|replace|show|desc|explain)[\s]+/i', $queryString, $matches ) ) {
+					return strtoupper( $matches[ 1 ] );
+		} else {
+					return self::QUERY_TYPE_OTHER;
+		}
 	}
 
 	/**
@@ -317,8 +319,9 @@ 
 	 */
 	public static function isArrayAssoc( array $arr )
 	{
-		if ( array() === $arr )
-			return false;
+		if ( array() === $arr ) {
+					return false;
+		}
 
 		return array_keys( $arr ) !== range( 0, count( $arr ) - 1 );
 	}

src/Traits/WhereAndHavingBuilder.php

Braces +14 added lines, -10 removed lines

@@ -103,10 +103,11 @@ 
 
 	private function makeInCondition()
 	{
-		if ( is_a( $this->temporaryParam[ 1 ], QuerySelect::class ) )
-			$this->inQuerySelect();
-		elseif ( is_array( $this->temporaryParam[ 1 ] ) )
-			$this->inArray();
+		if ( is_a( $this->temporaryParam[ 1 ], QuerySelect::class ) ) {
+					$this->inQuerySelect();
+		} elseif ( is_array( $this->temporaryParam[ 1 ] ) ) {
+					$this->inArray();
+		}
 	}
 
 	private function inQuerySelect()
@@ -182,8 +183,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';
@@ -212,11 +214,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[ 0 ] = $this->queryStructure->prepare( $param[ 0 ] );
 		$param[ 2 ] = trim( strtoupper( $param[ 2 ] ) );

src/Traits/OrderBy.php

Braces +9 added lines, -6 removed lines

@@ -28,8 +28,9 @@ 
 	{
 		$column = $this->queryStructure->prepare($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 = $this->queryStructure->prepare($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/GroupBy.php

Braces +9 added lines, -6 removed lines

@@ -28,8 +28,9 @@ 
 	{
 		$column = $this->queryStructure->prepare($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 = $this->queryStructure->prepare($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 '';
 	}

src/Traits/TableValidation.php

Braces +12 added lines, -8 removed lines

@@ -46,22 +46,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 QueryHelper::addBacktick($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/Limit.php

Braces +9 added lines, -6 removed lines

@@ -28,8 +28,9 @@ 
 	{
 		$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 );
+		}
 
 		$limit = $this->queryStructure->bindParam('lim', (int)$limit);
 
@@ -41,8 +42,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 );
+		}
 
 		$offset = $this->queryStructure->bindParam('ofs', (int)$offset);
 
@@ -53,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 );
 	}