adumitru68 / QueryBuilder

src/Traits/Utilities.php

Braces +3 added lines, -2 removed lines

@@ -34,8 +34,9 @@
 	 */
 	protected function getExplainSyntax()
 	{
-		if ( $this->queryStructure->getElement( QueryStructure::EXPLAIN ) )
-			return 'EXPLAIN';
+		if ( $this->queryStructure->getElement( QueryStructure::EXPLAIN ) ) {
+					return 'EXPLAIN';
+		}
 
 		return '';
 	}

src/Traits/OrderBy.php

Spacing +4 added lines, -4 removed lines

@@ -26,12 +26,12 @@ 
 	 * @return $this
 	 * @throws QueryException
 	 */
-	public function orderBy( $column, array $allowedColumns = [] )
+	public function orderBy( $column, array $allowedColumns = [ ] )
 	{
 		if ( !$this->validateColumn( $column, $allowedColumns ) )
 			throw new QueryException( 'Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
 
-		$column = $this->queryStructure->prepare($column);
+		$column = $this->queryStructure->prepare( $column );
 		$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column );
 
 		return $this;
@@ -44,12 +44,12 @@ 
 	 * @return $this
 	 * @throws QueryException
 	 */
-	public function orderByDesc( $column, array $allowedColumns = [] )
+	public function orderByDesc( $column, array $allowedColumns = [ ] )
 	{
 		if ( !$this->validateColumn( $column, $allowedColumns ) )
 			throw new QueryException( 'Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
 
-		$column = $this->queryStructure->prepare($column);
+		$column = $this->queryStructure->prepare( $column );
 		$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column . ' DESC' );
 
 		return $this;

Braces +9 added lines, -6 removed lines

@@ -28,8 +28,9 @@ 
 	 */
 	public function orderBy( $column, array $allowedColumns = [] )
 	{
-		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 );
+		}
 
 		$column = $this->queryStructure->prepare($column);
 		$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column );
@@ -46,8 +47,9 @@ 
 	 */
 	public function orderByDesc( $column, array $allowedColumns = [] )
 	{
-		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 );
+		}
 
 		$column = $this->queryStructure->prepare($column);
 		$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column . ' DESC' );
@@ -74,8 +76,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/ColumnValidation.php

Braces +6 added lines, -4 removed lines

@@ -26,11 +26,13 @@
 	 */
 	protected function validateColumn( $columnName, array $allowed )
 	{
-		if ( is_integer( $columnName ) )
-			return true;
+		if ( is_integer( $columnName ) ) {
+					return true;
+		}
 
-		if ( !count( $allowed ) )
-			return true;
+		if ( !count( $allowed ) ) {
+					return true;
+		}
 
 		return false;
 	}

src/Traits/GroupBy.php

Spacing +4 added lines, -4 removed lines

@@ -26,12 +26,12 @@ 
 	 * @return $this
 	 * @throws QueryException
 	 */
-	public function groupBy( $column, array $allowedColumns = [] )
+	public function groupBy( $column, array $allowedColumns = [ ] )
 	{
 		if ( !$this->validateColumn( $column, $allowedColumns ) )
 			throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
 
-		$column = $this->queryStructure->prepare($column);
+		$column = $this->queryStructure->prepare( $column );
 		$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column );
 
 		$this->queryStructure->setElement( QueryStructure::GROUP_BY, $column );
@@ -46,12 +46,12 @@ 
 	 * @return $this
 	 * @throws QueryException
 	 */
-	public function groupByDesc( $column, array $allowedColumns = [] )
+	public function groupByDesc( $column, array $allowedColumns = [ ] )
 	{
 		if ( !$this->validateColumn( $column, $allowedColumns ) )
 			throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
 
-		$column = $this->queryStructure->prepare($column);
+		$column = $this->queryStructure->prepare( $column );
 		$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column );
 
 		$this->queryStructure->setElement( QueryStructure::GROUP_BY, $column . ' DESC' );

Braces +9 added lines, -6 removed lines

@@ -28,8 +28,9 @@ 
 	 */
 	public function groupBy( $column, array $allowedColumns = [] )
 	{
-		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 );
+		}
 
 		$column = $this->queryStructure->prepare($column);
 		$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column );
@@ -48,8 +49,9 @@ 
 	 */
 	public function groupByDesc( $column, array $allowedColumns = [] )
 	{
-		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 );
+		}
 
 		$column = $this->queryStructure->prepare($column);
 		$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column );
@@ -78,8 +80,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/Abstracts/AbstractTableDao.php

Braces +21 added lines, -14 removed lines

@@ -67,8 +67,9 @@ 
 	public function getRowById( $id, array $fields = [] ) {
 		$conditions = $this->getPrimaryKeyConditions( $id );
 		$result = QueryBuild::select( $this->table )->fields( $fields );
-		foreach ( $conditions as $field => $value )
-			$result->whereEqual( $field, $value );
+		foreach ( $conditions as $field => $value ) {
+					$result->whereEqual( $field, $value );
+		}
 
 		return $result->first()->execute();
 	}
@@ -82,8 +83,9 @@ 
 	public function deleteRowById( $id ) {
 		$conditions = $this->getPrimaryKeyConditions( $id );
 		$result = QueryBuild::delete( $this->table );
-		foreach ( $conditions as $field => $value )
-			$result->whereEqual( $field, $value );
+		foreach ( $conditions as $field => $value ) {
+					$result->whereEqual( $field, $value );
+		}
 
 		return $result->execute();
 	}
@@ -97,8 +99,9 @@ 
 	public function updateRowById( $id, array $arrayUpdater ) {
 		$conditions = $this->getPrimaryKeyConditions( $id );
 		$result = QueryBuild::update( $this->table );
-		foreach ( $conditions as $field => $value )
-			$result->whereEqual( $field, $value );
+		foreach ( $conditions as $field => $value ) {
+					$result->whereEqual( $field, $value );
+		}
 		$result->setFieldsByArray( $arrayUpdater );
 
 		return $result->execute();
@@ -120,8 +123,9 @@ 
 	 * @throws QueryException
 	 */
 	public function getMaxOrder( $nullToZero = false ) {
-		if ( empty( $this->orderField ) )
-			throw new QueryException( 'Order field is not defined' );
+		if ( empty( $this->orderField ) ) {
+					throw new QueryException( 'Order field is not defined' );
+		}
 
 		$result = QueryBuild::select( $this->table )
 			->fieldExpression( "MAX(`{$this->orderField}`)", "max_order_column_alias" )
@@ -142,8 +146,9 @@ 
 	 * @throws QueryException
 	 */
 	public function saveOrder( $updates_ord = array() ) {
-		if ( empty( $this->orderField ) )
-			throw new QueryException( 'Order field is not defined' );
+		if ( empty( $this->orderField ) ) {
+					throw new QueryException( 'Order field is not defined' );
+		}
 
 		$query = /** @lang text */
 			"UPDATE `{$this->table}` SET `{$this->orderField}` = CASE `{$this->primary[0]}` \r\n";
@@ -166,13 +171,15 @@ 
 
 		$id = (array)$id;
 
-		if ( count( $this->primary ) !== count( $id ) )
-			throw new QueryException( 'Invalid primary key', QueryException::QUERY_CRUD_INVALID_PRIMARY );
+		if ( count( $this->primary ) !== count( $id ) ) {
+					throw new QueryException( 'Invalid primary key', QueryException::QUERY_CRUD_INVALID_PRIMARY );
+		}
 
 		$conditions = [];
 
-		foreach ( $this->primary as $index => $key )
-			$conditions[ $key ] = $id[ $index ];
+		foreach ( $this->primary as $index => $key ) {
+					$conditions[ $key ] = $id[ $index ];
+		}
 
 		return $conditions;
 	}

Spacing +10 added lines, -10 removed lines

@@ -42,7 +42,7 @@ 
 	 */
 	public function __construct() {
 		$this->table = $this->getTableName();
-		$this->primary = (array)$this->getPrimaryKey();
+		$this->primary = ( array ) $this->getPrimaryKey();
 		$this->orderField = $this->getOrderField();
 	}
 
@@ -69,7 +69,7 @@ 
 	 * @return array|bool
 	 * @throws QueryException
 	 */
-	public function getRowById( $id, array $fields = [] ) {
+	public function getRowById( $id, array $fields = [ ] ) {
 		$conditions = $this->getPrimaryKeyConditions( $id );
 		$result = QueryBuild::select( $this->table )->fields( $fields );
 		foreach ( $conditions as $field => $value )
@@ -85,7 +85,7 @@ 
 	 * @return array
 	 * @throws QueryException
 	 */
-	public function getFirstRowByCondition( $fieldName, $fieldValue, $fields = [] ) {
+	public function getFirstRowByCondition( $fieldName, $fieldValue, $fields = [ ] ) {
 		return QueryBuild::select( $this->table )
 			->fields( $fields )
 			->whereEqual( $fieldName, $fieldValue )
@@ -132,9 +132,9 @@ 
 	 * @throws QueryException
 	 */
 	public function updateRowsByFieldFilter( $fieldName, $fieldValue, array $arrayUpdater ) {
-		return QueryBuild::update($this->table)
-			->whereEqual($fieldName, $fieldValue)
-			->setFieldsByArray($arrayUpdater)
+		return QueryBuild::update( $this->table )
+			->whereEqual( $fieldName, $fieldValue )
+			->setFieldsByArray( $arrayUpdater )
 			->execute();
 	}
 
@@ -183,14 +183,14 @@ 
 			throw new QueryException( 'Order field is not defined' );
 
 		$query = /** @lang text */
-			"UPDATE `{$this->table}` SET `{$this->orderField}` = CASE `{$this->primary[0]}` \r\n";
+			"UPDATE `{$this->table}` SET `{$this->orderField}` = CASE `{$this->primary[ 0 ]}` \r\n";
 		foreach ( $updates_ord as $position => $id ) {
 			$pos = $position + 1;
 			$query .= " WHEN '$id' THEN '$pos' \r\n";
 		}
 		$query .= "ELSE `{$this->orderField}` END";
 
-		return PdoWrapperService::getInstance()->query( $query, [] );
+		return PdoWrapperService::getInstance()->query( $query, [ ] );
 	}
 
 
@@ -201,12 +201,12 @@ 
 	 */
 	protected function getPrimaryKeyConditions( $id ) {
 
-		$id = (array)$id;
+		$id = ( array ) $id;
 
 		if ( count( $this->primary ) !== count( $id ) )
 			throw new QueryException( 'Invalid primary key', QueryException::QUERY_CRUD_INVALID_PRIMARY );
 
-		$conditions = [];
+		$conditions = [ ];
 
 		foreach ( $this->primary as $index => $key )
 			$conditions[ $key ] = $id[ $index ];

src/Traits/SelectFields.php

Spacing +3 added lines, -3 removed lines

@@ -62,11 +62,11 @@ 
 
 	private function normalizeFields( $fields ) {
 		$array = Arrays::flattenValues( $fields );
-		$array = (array)$array;
+		$array = ( array ) $array;
 		$return = array();
 		array_walk_recursive( $array, function( $a ) use ( &$return ) {
 			$a = explode( ',', $a );
-			$return[] = $a;
+			$return[ ] = $a;
 		} );
 
 		return $return;
@@ -80,7 +80,7 @@ 
 			return '*';
 		}
 
-		return implode( ', ', (array)$this->queryStructure->getElement( QueryStructure::FIELDS ));
+		return implode( ', ', ( array ) $this->queryStructure->getElement( QueryStructure::FIELDS ) );
 	}
 
 }
\ No newline at end of file