adumitru68 / QueryBuilder

src/DB/DbService.php

Spacing +4 added lines, -4 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();
@@ -229,7 +229,7 @@ 
 				$this->bindMore( $parameters );
 			else
 				foreach ( $parameters as $key => $val )
-					$this->parameters[] = array( $key + 1, $val );
+					$this->parameters[ ] = array( $key + 1, $val );
 
 			if ( count( $this->parameters ) ) {
 				foreach ( $this->parameters as $param => $value ) {

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
@@ -225,24 +228,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 );
@@ -300,10 +301,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;
+		}
 	}
 
 	/**
@@ -312,8 +314,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 );
 	}