adumitru68 / QueryBuilder

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

Spacing +6 added lines, -6 removed lines

@@ -46,7 +46,7 @@ 
 	/**
 	 * @var array
 	 */
-	private $parameters = [];
+	private $parameters = [ ];
 
 	/**
 	 * @var string;
@@ -125,7 +125,7 @@ 
 		$column = null;
 
 		foreach ( $Columns as $cells ) {
-			$column[] = $cells[ 0 ];
+			$column[ ] = $cells[ 0 ];
 		}
 
 		return $column;
@@ -209,7 +209,7 @@ 
 	 * @param array $parameters
 	 * @throws DbException
 	 */
-	private function queryInit( $query, $parameters = [] )
+	private function queryInit( $query, $parameters = [ ] )
 	{
 		$this->lastStatement = self::getQueryStatement( $query );
 		$this->createPdoConnection();
@@ -220,7 +220,7 @@ 
 			 * Prepare query
 			 */
 			$this->sQuery = $this->pdo->prepare( $query );
-			$this->prepareParams($parameters);
+			$this->prepareParams( $parameters );
 			$this->pdoBindValues();
 			$this->sQuery->execute();
 			if ( DbConfig::getInstance()->isEnableLogQueryDuration() ) {
@@ -246,7 +246,7 @@ 
 			$this->bindMore( $parameters );
 		else
 			foreach ( $parameters as $key => $val )
-				$this->parameters[] = array( $key + 1, $val );
+				$this->parameters[ ] = array( $key + 1, $val );
 	}
 
 	private function pdoBindValues()
@@ -288,7 +288,7 @@ 
 	 */
 	public function bind( $para, $value )
 	{
-		$this->parameters[] = [ ":" . $para, $value ];
+		$this->parameters[ ] = [ ":" . $para, $value ];
 	}
 
 	public function CloseConnection()

sample/select.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
 use Qpdb\QueryBuilder\DB\DbService;
 use Qpdb\QueryBuilder\QueryBuild;
 
-include_once $_SERVER['DOCUMENT_ROOT'] . '/vendor/autoload.php';
+include_once $_SERVER[ 'DOCUMENT_ROOT' ] . '/vendor/autoload.php';
 
 
 $query = QueryBuild::select( 'employees' )
@@ -23,8 +23,8 @@ 
 $oldInst = DbService::getInstance();
 
 
-var_dump($oldInst->isMasterOnly());
-var_dump($newInst->isMasterOnly());
+var_dump( $oldInst->isMasterOnly() );
+var_dump( $newInst->isMasterOnly() );
 
 
 echo "<pre>" . print_r( $query->getSyntax(), 1 ) . "</pre>";

src/Traits/SelectFields.php

Spacing +2 added lines, -2 removed lines

@@ -63,14 +63,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[] = $this->queryStructure->prepare( $field );
+				$prepareArray[ ] = $this->queryStructure->prepare( $field );
 		}
 
 		return $prepareArray;

Braces +13 added lines, -10 removed lines

@@ -30,10 +30,11 @@ 
 
 				$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:
@@ -43,9 +44,9 @@ 
 					$fields = explode( ',', $fields );
 					$fields = $this->prepareArrayFields( $fields );
 					$this->queryStructure->setElement( QueryStructure::FIELDS, implode( ', ', $fields ) );
+				} else {
+									$this->queryStructure->setElement( QueryStructure::FIELDS, '*' );
 				}
-				else
-					$this->queryStructure->setElement( QueryStructure::FIELDS, '*' );
 				break;
 
 			default:
@@ -66,11 +67,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[] = $this->queryStructure->prepare( $field );
+			if ( '' !== trim( $field ) ) {
+							$prepareArray[] = $this->queryStructure->prepare( $field );
+			}
 		}
 
 		return $prepareArray;

src/Traits/WhereAndHavingBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -139,7 +139,7 @@ 
 
 		$pdoArray = array();
 		foreach ( $value as $item ) {
-			$pdoArray[] = $this->queryStructure->bindParam( 'a', $item );
+			$pdoArray[ ] = $this->queryStructure->bindParam( 'a', $item );
 		}
 		$body = [
 			$field,
@@ -216,7 +216,7 @@ 
 			throw new QueryException( 'Invalid where array!', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY );
 
 		if ( count( $param ) == 2 )
-			$param[] = '=';
+			$param[ ] = '=';
 
 		$param[ 0 ] = $this->queryStructure->prepare( $param[ 0 ] );
 		$param[ 2 ] = trim( strtoupper( $param[ 2 ] ) );

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

Spacing +4 added lines, -4 removed lines

@@ -24,9 +24,9 @@ 
 	 * @return $this
 	 * @throws QueryException
 	 */
-	public function orderBy( $column, array $allowedColumns = [] )
+	public function orderBy( $column, array $allowedColumns = [ ] )
 	{
-		$column = $this->queryStructure->prepare($column);
+		$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 );
@@ -43,9 +43,9 @@ 
 	 * @return $this
 	 * @throws QueryException
 	 */
-	public function orderByDesc( $column, array $allowedColumns = [] )
+	public function orderByDesc( $column, array $allowedColumns = [ ] )
 	{
-		$column = $this->queryStructure->prepare($column);
+		$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 );

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

Spacing +4 added lines, -4 removed lines

@@ -24,9 +24,9 @@ 
 	 * @return $this
 	 * @throws QueryException
 	 */
-	public function groupBy( $column, array $allowedColumns = [] )
+	public function groupBy( $column, array $allowedColumns = [ ] )
 	{
-		$column = $this->queryStructure->prepare($column);
+		$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 );
@@ -43,9 +43,9 @@ 
 	 * @return $this
 	 * @throws QueryException
 	 */
-	public function groupByDesc( $column, array $allowedColumns = [] )
+	public function groupByDesc( $column, array $allowedColumns = [ ] )
 	{
-		$column = $this->queryStructure->prepare($column);
+		$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 );

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