adumitru68 / QueryBuilder

src/DB/DbService.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
 	/**
 	 * @var array
 	 */
-	private $parameters = [];
+	private $parameters = [ ];
 
 
 	/**
@@ -99,7 +99,7 @@ 
 		$column = null;
 
 		foreach ( $Columns as $cells ) {
-			$column[] = $cells[ 0 ];
+			$column[ ] = $cells[ 0 ];
 		}
 
 		return $column;
@@ -135,7 +135,7 @@ 
 	 * @param string $query
 	 * @param array $parameters
 	 */
-	private function queryInit( $query, $parameters = [] )
+	private function queryInit( $query, $parameters = [ ] )
 	{
 		$this->pdo = DbConnect::getInstance()->getConnection( self::getQueryStatement( $query ) );
 		$startQueryTime = microtime( true );
@@ -154,7 +154,7 @@ 
 				$this->bindMore( $parameters );
 			else
 				foreach ( $parameters as $key => $val )
-					$this->parameters[] = array( $key + 1, $val );
+					$this->parameters[ ] = array( $key + 1, $val );
 
 			if ( count( $this->parameters ) ) {
 				foreach ( $this->parameters as $param => $value ) {

Braces +20 added lines, -22 removed lines

@@ -66,14 +66,12 @@ 
 			$statement === self::QUERY_TYPE_EXPLAIN
 		) {
 			return $this->sQuery->fetchAll( $fetchMode );
-		}
-		elseif ( $statement === self::QUERY_TYPE_INSERT ||
+		} elseif ( $statement === self::QUERY_TYPE_INSERT ||
 			$statement === self::QUERY_TYPE_UPDATE ||
 			$statement === self::QUERY_TYPE_DELETE
 		) {
 			return $this->sQuery->rowCount();
-		}
-		else {
+		} else {
 
 			return NULL;
 		}
@@ -91,8 +89,9 @@ 
 		$query = trim( str_replace( "\r", " ", $query ) );
 		$statement = self::getQueryStatement( $query );
 
-		if ( $statement === self::QUERY_TYPE_EXPLAIN )
-			return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC );
+		if ( $statement === self::QUERY_TYPE_EXPLAIN ) {
+					return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC );
+		}
 
 		$Columns = $this->sQuery->fetchAll( \PDO::FETCH_NUM );
 
@@ -112,8 +111,9 @@ 
 		$query = trim( str_replace( "\r", " ", $query ) );
 		$statement = self::getQueryStatement( $query );
 
-		if ( $statement === self::QUERY_TYPE_EXPLAIN )
-			return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC );
+		if ( $statement === 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,
@@ -150,24 +150,22 @@ 
 			/**
 			 * Add parameters to the parameter array
 			 */
-			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 );
+			}
 
 			if ( count( $this->parameters ) ) {
 				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 );
@@ -246,8 +244,7 @@ 
 				default:
 					return self::QUERY_TYPE_OTHER;
 			}
-		}
-		else {
+		} else {
 			return self::QUERY_TYPE_OTHER;
 		}
 	}
@@ -258,8 +255,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/Dependencies/QueryHelper.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
 		foreach ( $brutArray as $value ) {
 			$value = trim( $value );
 			if ( '' !== $value )
-				$newArray[] = $value;
+				$newArray[ ] = $value;
 		}
 
 		return $newArray;

Braces +9 added lines, -6 removed lines

@@ -87,8 +87,9 @@ 
 		$newArray = array();
 		foreach ( $brutArray as $value ) {
 			$value = trim( $value );
-			if ( '' !== $value )
-				$newArray[] = $value;
+			if ( '' !== $value ) {
+							$newArray[] = $value;
+			}
 		}
 
 		return $newArray;
@@ -138,8 +139,9 @@ 
 		$characters = 'abcdefghijklmnopqrstuvwxyz';
 		$charactersLength = strlen( $characters );
 		$randomString = '';
-		for ( $i = 0; $i < $length; $i++ )
-			$randomString .= $characters[ rand( 0, $charactersLength - 1 ) ];
+		for ( $i = 0; $i < $length; $i++ ) {
+					$randomString .= $characters[ rand( 0, $charactersLength - 1 ) ];
+		}
 
 		return str_shuffle( $randomString );
 	}
@@ -147,8 +149,9 @@ 
 	public static function limitString( $rowCount, $offset = null )
 	{
 		$rowCount = intval( $rowCount );
-		if ( is_null( $offset ) )
-			return $rowCount;
+		if ( is_null( $offset ) ) {
+					return $rowCount;
+		}
 		$offset = intval( $offset );
 
 		return "$offset, $rowCount";

src/Traits/Where.php

Spacing +2 added lines, -2 removed lines

@@ -278,7 +278,7 @@ 
 	 * @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 );
 
@@ -290,7 +290,7 @@ 
 	 * @param array $bindParams
 	 * @return $this
 	 */
-	public function orWhereExpression( $whereString, array $bindParams = [] )
+	public function orWhereExpression( $whereString, array $bindParams = [ ] )
 	{
 		$whereString = $this->queryStructure->bindParamsExpression( $whereString, $bindParams );
 

src/Traits/OrderBy.php

Spacing +2 added lines, -2 removed lines

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

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

Spacing +2 added lines, -2 removed lines

@@ -278,7 +278,7 @@ 
 	 * @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 );
 
@@ -290,7 +290,7 @@ 
 	 * @param array $bindParams
 	 * @return $this
 	 */
-	public function orHavingExpression( $whereString, array $bindParams = [] )
+	public function orHavingExpression( $whereString, array $bindParams = [ ] )
 	{
 		$whereString = $this->queryStructure->bindParamsExpression( $whereString, $bindParams );
 

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/Traits/WhereAndHavingBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
 	{
 		$pdoArray = array();
 		foreach ( $value as $item ) {
-			$pdoArray[] = $this->queryStructure->bindParam( 'a', $item );
+			$pdoArray[ ] = $this->queryStructure->bindParam( 'a', $item );
 		}
 		$body = [
 			$field,
@@ -189,7 +189,7 @@ 
 			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 ] );

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