adumitru68 / QueryBuilder

src/Traits/TableValidation.php

Braces +12 added lines, -8 removed lines

@@ -45,22 +45,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 $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/Where.php

Spacing +3 added lines, -3 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 );
 		return $this->where( $whereString, $glue );
@@ -289,7 +289,7 @@ 
 	 * @param array $bindParams
 	 * @return $this
 	 */
-	public function orWhereExpression( $whereString, array $bindParams = [] )
+	public function orWhereExpression( $whereString, array $bindParams = [ ] )
 	{
 		$whereString = $this->queryStructure->bindParamsExpression( $whereString, $bindParams );
 		return $this->where( $whereString, 'OR' );
@@ -352,7 +352,7 @@ 
 	 */
 	private function where( $param, $glue = 'AND' )
 	{
-		return $this->/** @scrutinizer ignore-call */ createCondition($param, $glue, QueryStructure::WHERE );
+		return $this->/** @scrutinizer ignore-call */ createCondition( $param, $glue, QueryStructure::WHERE );
 	}
 
 }
\ No newline at end of file

src/DB/DbConnect.php

Spacing +2 added lines, -2 removed lines

@@ -99,10 +99,10 @@
 	 */
 	private function connect( $dataConnect )
 	{
-		$dsn = 'mysql:dbname=' . $dataConnect["dbname"] . ';host=' . $dataConnect["host"] . '';
+		$dsn = 'mysql:dbname=' . $dataConnect[ "dbname" ] . ';host=' . $dataConnect[ "host" ] . '';
 		try {
 
-			$pdo = new \PDO( $dsn, $dataConnect["user"], $dataConnect["password"],
+			$pdo = new \PDO( $dsn, $dataConnect[ "user" ], $dataConnect[ "password" ],
 				array( \PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8" )
 			);
 

src/DB/DbLog.php

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 	public function writeQueryDuration( $query, $duration )
 	{
 		$backtrace = end( debug_backtrace() );
-		$location = $backtrace['file'] . " Line: " . $backtrace['line'];
+		$location = $backtrace[ 'file' ] . " Line: " . $backtrace[ 'line' ];
 
 		$this->path = DbConfig::getInstance()->getLogPathQueryDuration(); //my comments
 		$message = "Duration: " . round( $duration, 5 ) . "\r\n";
@@ -57,13 +57,13 @@ 
 	public function writeQueryErros( $query, $code, $error )
 	{
 		$backtrace = end( debug_backtrace() );
-		$location = $backtrace['file'] . " Line: " . $backtrace['line'];
+		$location = $backtrace[ 'file' ] . " Line: " . $backtrace[ 'line' ];
 
 		$this->path = DbConfig::getInstance()->getLogPathErrors(); //my comments
 		$message = "Query: $query" . "\r\n";
 		$message .= "Location: $location\r\n";
 		$message .= "Error code : " . $code . "\r\n";
-		$message .= "" . $error ;
+		$message .= "" . $error;
 
 		$this->write( $message );
 	}

Braces +2 added lines, -4 removed lines

@@ -85,12 +85,10 @@
 				$fh = fopen( $log, 'a+' );
 				fwrite( $fh, $messageFormat );
 				fclose( $fh );
-			}
-			else {
+			} else {
 				$this->edit( $log, $messageFormat );
 			}
-		}
-		else {
+		} else {
 			if ( mkdir( $this->path, 0777 ) === true ) {
 				$this->write( $message );
 			}

src/DB/DbService.php

Spacing +26 added lines, -26 removed lines

@@ -43,7 +43,7 @@ 
 	/**
 	 * @var array
 	 */
-	private $parameters = [];
+	private $parameters = [ ];
 
 
 	/**
@@ -60,14 +60,14 @@ 
 
 		$this->queryInit( $query, $params );
 
-		if( $statement === self::QUERY_TYPE_SELECT ||
+		if ( $statement === self::QUERY_TYPE_SELECT ||
 			$statement === self::QUERY_TYPE_SHOW ||
 			$statement === self::QUERY_TYPE_DESC ||
 			$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
 		) {
@@ -91,15 +91,15 @@ 
 		$query = trim( str_replace( "\r", " ", $query ) );
 		$statement = self::getQueryStatement( $query );
 
-		if( $statement === self::QUERY_TYPE_EXPLAIN )
+		if ( $statement === self::QUERY_TYPE_EXPLAIN )
 			return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC );
 
 		$Columns = $this->sQuery->fetchAll( \PDO::FETCH_NUM );
 
 		$column = null;
 
-		foreach( $Columns as $cells ) {
-			$column[] = $cells[ 0 ];
+		foreach ( $Columns as $cells ) {
+			$column[ ] = $cells[ 0 ];
 		}
 
 		return $column;
@@ -112,7 +112,7 @@ 
 		$query = trim( str_replace( "\r", " ", $query ) );
 		$statement = self::getQueryStatement( $query );
 
-		if( $statement === self::QUERY_TYPE_EXPLAIN )
+		if ( $statement === self::QUERY_TYPE_EXPLAIN )
 			return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC );
 
 		$result = $this->sQuery->fetch( $fetchmode );
@@ -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 );
@@ -150,21 +150,21 @@ 
 			/**
 			 * Add parameters to the parameter array
 			 */
-			if( self::isArrayAssoc( $parameters ) )
+			if ( self::isArrayAssoc( $parameters ) )
 				$this->bindMore( $parameters );
 			else
-				foreach( $parameters as $key => $val )
-					$this->parameters[] = array( $key + 1, $val );
+				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 ] ) ) {
+			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 {
@@ -176,13 +176,13 @@ 
 
 			$this->sQuery->execute();
 
-			if( DbConfig::getInstance()->isEnableLogQueryDuration() ) {
+			if ( DbConfig::getInstance()->isEnableLogQueryDuration() ) {
 				$duration = microtime( true ) - $startQueryTime;
 				DbLog::getInstance()->writeQueryDuration( $query, $duration );
 			}
 
-		} catch( \PDOException $e ) {
-			if( DbConfig::getInstance()->isEnableLogErrors() ) {
+		} catch ( \PDOException $e ) {
+			if ( DbConfig::getInstance()->isEnableLogErrors() ) {
 				DbLog::getInstance()->writeQueryErros( $query, $e->getCode(), $e->getMessage() );
 			}
 			throw new DbException( 'Database error!', DbException::DB_QUERY_ERROR );
@@ -197,9 +197,9 @@ 
 
 	public function bindMore( $parray )
 	{
-		if( !count( $this->parameters ) && is_array( $parray ) ) {
+		if ( !count( $this->parameters ) && is_array( $parray ) ) {
 			$columns = array_keys( $parray );
-			foreach( $columns as $i => &$column ) {
+			foreach ( $columns as $i => &$column ) {
 				$this->bind( $column, $parray[ $column ] );
 			}
 		}
@@ -225,12 +225,12 @@ 
 	{
 		$queryString = trim( $queryString );
 
-		if( $queryString === '' ) {
+		if ( $queryString === '' ) {
 			return self::QUERY_TYPE_EMPTY;
 		}
 
-		if( preg_match( '/^(select|insert|update|delete|replace|show|desc|explain)[\s]+/i', $queryString, $matches ) ) {
-			switch( strtolower( $matches[ 1 ] ) ) {
+		if ( preg_match( '/^(select|insert|update|delete|replace|show|desc|explain)[\s]+/i', $queryString, $matches ) ) {
+			switch ( strtolower( $matches[ 1 ] ) ) {
 				case 'select':
 					return self::QUERY_TYPE_SELECT;
 				case 'insert':
@@ -258,7 +258,7 @@ 
 	 */
 	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 );
 	}
@@ -269,7 +269,7 @@ 
 	 */
 	public static function getInstance()
 	{
-		if( null === self::$instance ) {
+		if ( null === self::$instance ) {
 			self::$instance = new self();
 		}
 

Braces +20 added lines, -21 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,7 +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/Statements/QueryUpdate.php

Spacing +9 added lines, -9 removed lines

@@ -52,47 +52,47 @@
 		/**
 		 *  Explain
 		 */
-		$syntax[] = $this->getExplainSyntax();
+		$syntax[ ] = $this->getExplainSyntax();
 
 		/**
 		 * UPDATE statement
 		 */
-		$syntax[] = $this->statement;
+		$syntax[ ] = $this->statement;
 
 		/**
 		 * PRIORITY
 		 */
-		$syntax[] = $this->queryStructure->getElement( QueryStructure::PRIORITY );
+		$syntax[ ] = $this->queryStructure->getElement( QueryStructure::PRIORITY );
 
 		/**
 		 * IGNORE clause
 		 */
-		$syntax[] = $this->queryStructure->getElement( QueryStructure::IGNORE ) ? 'IGNORE' : '';
+		$syntax[ ] = $this->queryStructure->getElement( QueryStructure::IGNORE ) ? 'IGNORE' : '';
 
 		/**
 		 * TABLE update
 		 */
-		$syntax[] = $this->queryStructure->getElement( QueryStructure::TABLE );
+		$syntax[ ] = $this->queryStructure->getElement( QueryStructure::TABLE );
 
 		/**
 		 * FIELDS update
 		 */
-		$syntax[] = $this->getSettingFieldsSyntax();
+		$syntax[ ] = $this->getSettingFieldsSyntax();
 
 		/**
 		 * WHERE clause
 		 */
-		$syntax[] = $this->getWhereSyntax();
+		$syntax[ ] = $this->getWhereSyntax();
 
 		/**
 		 * ORDER BY clause
 		 */
-		$syntax[] = $this->getOrderBySyntax();
+		$syntax[ ] = $this->getOrderBySyntax();
 
 		/**
 		 * LIMIT clause
 		 */
-		$syntax[] = $this->getLimitSyntax();
+		$syntax[ ] = $this->getLimitSyntax();
 
 		$syntax = implode( ' ', $syntax );