adumitru68 / QueryBuilder

src/Traits/Limit.php

Braces +12 added lines, -8 removed lines

@@ -28,11 +28,13 @@ 
     {
         $limit = trim($limit);
 
-        if (!QueryHelper::isInteger($limit))
-            throw new QueryException('Invalid Limit value', QueryException::QUERY_ERROR_INVALID_LIMIT);
+        if (!QueryHelper::isInteger($limit)) {
+                    throw new QueryException('Invalid Limit value', QueryException::QUERY_ERROR_INVALID_LIMIT);
+        }
 
-        if ($limit == 0)
-            throw new QueryException('Invalid Limit zero', QueryException::QUERY_ERROR_INVALID_LIMIT_ZERO);
+        if ($limit == 0) {
+                    throw new QueryException('Invalid Limit zero', QueryException::QUERY_ERROR_INVALID_LIMIT_ZERO);
+        }
 
         if (is_null($offset)) {
             $this->queryStructure->setElement(QueryStructure::LIMIT, $limit);
@@ -42,8 +44,9 @@ 
 
         $offset = trim($offset);
 
-        if (!QueryHelper::isInteger($offset))
-            throw new QueryException('Invalid Limit offset', QueryException::QUERY_ERROR_INVALID_LIMIT_OFFSET);
+        if (!QueryHelper::isInteger($offset)) {
+                    throw new QueryException('Invalid Limit offset', QueryException::QUERY_ERROR_INVALID_LIMIT_OFFSET);
+        }
 
         $this->queryStructure->setElement(QueryStructure::LIMIT, $offset . ',' . $limit);
 
@@ -52,8 +55,9 @@ 
 
     private function getLimitSyntax()
     {
-        if (!$this->queryStructure->getElement(QueryStructure::LIMIT))
-            return '';
+        if (!$this->queryStructure->getElement(QueryStructure::LIMIT)) {
+                    return '';
+        }
 
         return 'LIMIT ' . $this->queryStructure->getElement(QueryStructure::LIMIT);
     }

src/Traits/ColumnValidation.php

Braces +6 added lines, -4 removed lines

@@ -16,11 +16,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/Statements/QuerySelect.php

Braces +9 added lines, -6 removed lines

@@ -55,8 +55,9 @@ 
             $this->queryStructure->setElement(QueryStructure::TABLE, $tableName);
 
             $tableSelectParams = $table->getBindParams();
-            foreach ($tableSelectParams as $key => $value)
-                $this->queryStructure->setParams($key, $value);
+            foreach ($tableSelectParams as $key => $value) {
+                            $this->queryStructure->setParams($key, $value);
+            }
 
         }
     }
@@ -107,8 +108,9 @@ 
             $this->queryStructure->setElement(QueryStructure::DISTINCT, 0); //???
         }
 
-        if ($this->queryStructure->getElement(QueryStructure::FIRST))
-            $this->queryStructure->setElement(QueryStructure::LIMIT, 1);
+        if ($this->queryStructure->getElement(QueryStructure::FIRST)) {
+                    $this->queryStructure->setElement(QueryStructure::LIMIT, 1);
+        }
 
         $syntax = array();
 
@@ -190,8 +192,9 @@ 
                 return DbService::getInstance()->single($this->getSyntax(), $this->queryStructure->getElement(QueryStructure::BIND_PARAMS));
                 break;
             case $this->queryStructure->getElement(QueryStructure::FIRST):
-                if ($this->queryStructure->getElement(QueryStructure::COLUMN))
-                    return DbService::getInstance()->single($this->getSyntax(), $this->queryStructure->getElement(QueryStructure::BIND_PARAMS));
+                if ($this->queryStructure->getElement(QueryStructure::COLUMN)) {
+                                    return DbService::getInstance()->single($this->getSyntax(), $this->queryStructure->getElement(QueryStructure::BIND_PARAMS));
+                }
 
                 return DbService::getInstance()->row($this->getSyntax(), $this->queryStructure->getElement(QueryStructure::BIND_PARAMS));
                 break;

src/Statements/QueryUpdate.php

Braces +3 added lines, -2 removed lines

@@ -106,8 +106,9 @@
      */
     public function execute()
     {
-        if ($this->queryStructure->getElement((QueryStructure::WHERE_TRIGGER)) && !count($this->queryStructure->getElement(QueryStructure::WHERE)))
-            throw new QueryException('Where clause is required for this statement!', QueryException::QUERY_ERROR_DELETE_NOT_FILTER);
+        if ($this->queryStructure->getElement((QueryStructure::WHERE_TRIGGER)) && !count($this->queryStructure->getElement(QueryStructure::WHERE))) {
+                    throw new QueryException('Where clause is required for this statement!', QueryException::QUERY_ERROR_DELETE_NOT_FILTER);
+        }
 
         return DbService::getInstance()->query($this->getSyntax(), $this->queryStructure->getElement(QueryStructure::BIND_PARAMS));
     }

src/Statements/QueryDelete.php

Braces +3 added lines, -2 removed lines

@@ -96,8 +96,9 @@
     public function execute()
     {
 
-        if ($this->queryStructure->getElement((QueryStructure::WHERE_TRIGGER)) && !count($this->queryStructure->getElement(QueryStructure::WHERE)))
-            throw new QueryException('Where or Having clause is required for this statement!', QueryException::QUERY_ERROR_DELETE_NOT_FILTER);
+        if ($this->queryStructure->getElement((QueryStructure::WHERE_TRIGGER)) && !count($this->queryStructure->getElement(QueryStructure::WHERE))) {
+                    throw new QueryException('Where or Having clause is required for this statement!', QueryException::QUERY_ERROR_DELETE_NOT_FILTER);
+        }
 
         return DbService::getInstance()->query($this->getSyntax(), $this->queryStructure->getElement(QueryStructure::BIND_PARAMS));
 

src/DB/DbConfig.php

Braces +11 added lines, -8 removed lines

@@ -60,10 +60,11 @@ 
 	private function __construct()
 	{
 		$vendorCfg = __DIR__ . '/../../../../../vendor-cfg/qpdb_db_config.php';
-		if ( file_exists( $vendorCfg ) )
-			$this->dbConfig = require $vendorCfg;
-		else
-			$this->dbConfig = require __DIR__ . '/../../config/qpdb_db_config.php';
+		if ( file_exists( $vendorCfg ) ) {
+					$this->dbConfig = require $vendorCfg;
+		} else {
+					$this->dbConfig = require __DIR__ . '/../../config/qpdb_db_config.php';
+		}
 
 		$this->buildConfig();
 	}
@@ -146,8 +147,9 @@ 
 
 	public function useTablePrefix()
 	{
-		if ( !empty( $this->dbConfig[ 'use_table_prefix' ] ) )
-			return $this->dbConfig[ 'use_table_prefix' ];
+		if ( !empty( $this->dbConfig[ 'use_table_prefix' ] ) ) {
+					return $this->dbConfig[ 'use_table_prefix' ];
+		}
 
 		return false;
 	}
@@ -182,8 +184,9 @@ 
 	private function readMasterDataConnect()
 	{
 
-		if ( !isset( $this->dbConfig[ 'master_data_connect' ][ 0 ] ) )
-			throw new DbException( 'Master data connect is missing', DbException::DB_ERROR_MASTER_DATA_CONNECTION_MISSING );
+		if ( !isset( $this->dbConfig[ 'master_data_connect' ][ 0 ] ) ) {
+					throw new DbException( 'Master data connect is missing', DbException::DB_ERROR_MASTER_DATA_CONNECTION_MISSING );
+		}
 
 		$dataConnection = $this->dbConfig[ 'master_data_connect' ];
 

src/DB/DbService.php

Braces +20 added lines, -22 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,8 +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/Dependencies/QueryHelper.php

Braces +9 added lines, -6 removed lines

@@ -87,8 +87,9 @@ 
 		$newArray = array();
 		foreach ( $brutArray as $value ) {
 			$value = trim( $value );
-			if ( '' !== $value )
-				$newArray[] = $value;
+			if ( '' !== $value ) {
+							$newArray[] = $value;
+			}
 		}
 
 		return $newArray;
@@ -138,8 +139,9 @@ 
 		$characters = 'abcdefghijklmnopqrstuvwxyz';
 		$charactersLength = strlen( $characters );
 		$randomString = '';
-		for ( $i = 0; $i < $length; $i++ )
-			$randomString .= $characters[ rand( 0, $charactersLength - 1 ) ];
+		for ( $i = 0; $i < $length; $i++ ) {
+					$randomString .= $characters[ rand( 0, $charactersLength - 1 ) ];
+		}
 
 		return str_shuffle( $randomString );
 	}
@@ -147,8 +149,9 @@ 
 	public static function limitString( $rowCount, $offset = null )
 	{
 		$rowCount = intval( $rowCount );
-		if ( is_null( $offset ) )
-			return $rowCount;
+		if ( is_null( $offset ) ) {
+					return $rowCount;
+		}
 		$offset = intval( $offset );
 
 		return "$offset, $rowCount";

src/Traits/OrderBy.php

Braces +9 added lines, -6 removed lines

@@ -28,8 +28,9 @@ 
 	{
 		$column = trim( $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 = trim( $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 '';
 	}