adumitru68 / QueryBuilder

src/Traits/SelectFields.php

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

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/Dependencies/QueryStructure.php

Braces +26 added lines, -18 removed lines

@@ -97,8 +97,9 @@ 
 	{
 		$this->syntaxEL = $this->init();
 
-		foreach ( $this->syntaxEL as $name => $value )
-			$this->typeEL[ $name ] = gettype( $value );
+		foreach ( $this->syntaxEL as $name => $value ) {
+					$this->typeEL[ $name ] = gettype( $value );
+		}
 
 	}
 
@@ -184,16 +185,19 @@ 
 	 */
 	public function setElement( $name, $value )
 	{
-		if ( !array_key_exists( $name, $this->syntaxEL ) )
-			throw new QueryException( 'Invalid Query property', QueryException::QUERY_ERROR_ELEMENT_NOT_FOUND );
+		if ( !array_key_exists( $name, $this->syntaxEL ) ) {
+					throw new QueryException( 'Invalid Query property', QueryException::QUERY_ERROR_ELEMENT_NOT_FOUND );
+		}
 
-		if ( $name == self::TABLE && is_a( $value, QueryStatement::class ) )
-			return true;
+		if ( $name == self::TABLE && is_a( $value, QueryStatement::class ) ) {
+					return true;
+		}
 
-		if ( $this->typeEL[ $name ] === self::ELEMENT_TYPE_ARRAY )
-			$this->syntaxEL[ $name ][] = $value;
-		else
-			$this->syntaxEL[ $name ] = $value;
+		if ( $this->typeEL[ $name ] === self::ELEMENT_TYPE_ARRAY ) {
+					$this->syntaxEL[ $name ][] = $value;
+		} else {
+					$this->syntaxEL[ $name ] = $value;
+		}
 
 		return true;
 	}
@@ -206,8 +210,9 @@ 
 	 */
 	public function replaceElement( $elementName, $elementValue )
 	{
-		if ( !array_key_exists( $elementName, $this->syntaxEL ) )
-			throw new QueryException( 'Invalid Query property', QueryException::QUERY_ERROR_ELEMENT_NOT_FOUND );
+		if ( !array_key_exists( $elementName, $this->syntaxEL ) ) {
+					throw new QueryException( 'Invalid Query property', QueryException::QUERY_ERROR_ELEMENT_NOT_FOUND );
+		}
 
 		$this->syntaxEL[ $elementName ] = $elementValue;
 	}
@@ -240,11 +245,13 @@ 
 	 */
 	public function bindParamsExpression( $expression, array $params = [], $search = '?' )
 	{
-		if ( !count( $params ) )
-			return $expression;
+		if ( !count( $params ) ) {
+					return $expression;
+		}
 
-		if ( strpos( $expression, $search ) === false )
-			return $expression;
+		if ( strpos( $expression, $search ) === false ) {
+					return $expression;
+		}
 
 		$params = array_slice( $params, 0, substr_count( $expression, $search ) );
 
@@ -277,8 +284,9 @@ 
 	public function prepare( $fieldName = '' )
 	{
 		$fieldName = trim( $fieldName );
-		if ( in_array( $fieldName, $this->reserved ) )
-			$fieldName = '`' . $fieldName . '`';
+		if ( in_array( $fieldName, $this->reserved ) ) {
+					$fieldName = '`' . $fieldName . '`';
+		}
 
 		return $fieldName;
 	}