adumitru68 / QueryBuilder

src/DB/DbService.php

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