adumitru68 / QueryBuilder

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

src/Traits/TableValidation.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 		if ( DbConfig::getInstance()->useTablePrefix() )
 			$table = str_ireplace( '::', DbConfig::getInstance()->getTablePrefix(), $table );
 
-		return QueryHelper::addBacktick($table);
+		return QueryHelper::addBacktick( $table );
 	}
 
 	private function validateTableSubQuery( $table )

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

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 		if ( !QueryHelper::isInteger( $limit ) )
 			throw new QueryException( 'Invalid Limit value', QueryException::QUERY_ERROR_INVALID_LIMIT );
 
-		$limit = $this->queryStructure->bindParam('lim', (int)$limit);
+		$limit = $this->queryStructure->bindParam( 'lim', ( int ) $limit );
 
 		if ( is_null( $offset ) ) {
 			$this->queryStructure->setElement( QueryStructure::LIMIT, $limit );
@@ -44,7 +44,7 @@ 
 		if ( !QueryHelper::isInteger( $offset ) )
 			throw new QueryException( 'Invalid Limit offset', QueryException::QUERY_ERROR_INVALID_LIMIT_OFFSET );
 
-		$offset = $this->queryStructure->bindParam('ofs', (int)$offset);
+		$offset = $this->queryStructure->bindParam( 'ofs', ( int ) $offset );
 
 		$this->queryStructure->setElement( QueryStructure::LIMIT, $offset . ', ' . $limit );
 

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

src/Traits/AsSingleton.php

Braces +3 added lines, -2 removed lines

@@ -19,8 +19,9 @@
 	 */
 	public static function getInstance()
 	{
-		if ( is_null( self::$instance ) )
-			self::$instance = new self();
+		if ( is_null( self::$instance ) ) {
+					self::$instance = new self();
+		}
 
 		return self::$instance;
 	}

src/Traits/SelectFields.php

Spacing +4 added lines, -4 removed lines

@@ -74,19 +74,19 @@
 	 */
 	private function prepareArrayFields( $fieldsArray = array() )
 	{
-		$prepareArray = [];
+		$prepareArray = [ ];
 
 		foreach ( $fieldsArray as $field ) {
 
 			switch ( gettype( $field ) ) {
 				case QueryStructure::ELEMENT_TYPE_STRING:
-					$prepareArray[] = $this->queryStructure->prepare( $field );
+					$prepareArray[ ] = $this->queryStructure->prepare( $field );
 					break;
 				case QueryStructure::ELEMENT_TYPE_ARRAY:
-					$prepareArray[] = $this->getFieldByArray( $field );
+					$prepareArray[ ] = $this->getFieldByArray( $field );
 					break;
 				default:
-					throw new QueryException('Invalid field description');
+					throw new QueryException( 'Invalid field description' );
 			}
 		}
 

Braces +8 added lines, -8 removed lines

@@ -31,10 +31,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:
@@ -44,9 +45,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:
@@ -108,8 +109,7 @@ 
 
 		if ( count( $fieldArray ) === 1 ) {
 			return $this->queryStructure->prepare( trim( $fieldArray[ 0 ] ) );
-		}
-		else {
+		} else {
 			return $this->queryStructure->prepare( trim( $fieldArray[ 0 ] ) ) . ' ' . $this->queryStructure->prepare( trim( $fieldArray[ 1 ] ) );
 		}
 

src/Dependencies/QueryHelper.php

Spacing +3 added lines, -3 removed lines

@@ -58,7 +58,7 @@ 
 		foreach ( $brutArray as $value ) {
 			$value = trim( $value );
 			if ( '' !== $value )
-				$newArray[] = $value;
+				$newArray[ ] = $value;
 		}
 
 		return $newArray;
@@ -120,14 +120,14 @@ 
 	public static function addBacktick( $string )
 	{
 		$string = str_replace( '`', '', $string );
-		$stringArrayBacktick = [];
+		$stringArrayBacktick = [ ];
 		$string = self::clearMultipleSpaces( $string );
 		$stringArray = explode( '.', $string );
 		foreach ( $stringArray as $part ) {
 			$part = self::clearMultipleSpaces( $part );
 			if ( empty( $part ) )
 				continue;
-			$stringArrayBacktick[] = '`' . $part . '`';
+			$stringArrayBacktick[ ] = '`' . $part . '`';
 		}
 
 		return implode( '.', $stringArrayBacktick );

Braces +9 added lines, -6 removed lines

@@ -57,8 +57,9 @@ 
 		$newArray = array();
 		foreach ( $brutArray as $value ) {
 			$value = trim( $value );
-			if ( '' !== $value )
-				$newArray[] = $value;
+			if ( '' !== $value ) {
+							$newArray[] = $value;
+			}
 		}
 
 		return $newArray;
@@ -110,8 +111,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 );
 	}
@@ -125,8 +127,9 @@ 
 		$stringArray = explode( '.', $string );
 		foreach ( $stringArray as $part ) {
 			$part = self::clearMultipleSpaces( $part );
-			if ( empty( $part ) )
-				continue;
+			if ( empty( $part ) ) {
+							continue;
+			}
 			$stringArrayBacktick[] = '`' . $part . '`';
 		}