adumitru68 / QueryBuilder

src/Dependencies/QueryStructure.php

Braces +23 added lines, -16 removed lines

@@ -85,8 +85,9 @@ 
 	{
 		$this->syntaxEL = $this->init();
 
-		foreach ( $this->syntaxEL as $name => $value )
-			$this->typeEL[ $name ] = gettype( $value );
+		foreach ( $this->syntaxEL as $name => $value ) {
+					$this->typeEL[ $name ] = gettype( $value );
+		}
 
 	}
 
@@ -172,16 +173,19 @@ 
 	 */
 	public function setElement( $name, $value )
 	{
-		if ( !array_key_exists( $name, $this->syntaxEL ) )
-			throw new QueryException( 'Invalid Query property', QueryException::QUERY_ERROR_ELEMENT_NOT_FOUND );
+		if ( !array_key_exists( $name, $this->syntaxEL ) ) {
+					throw new QueryException( 'Invalid Query property', QueryException::QUERY_ERROR_ELEMENT_NOT_FOUND );
+		}
 
-		if ( $name == self::TABLE && is_a( $value, QueryStatement::class ) )
-			return true;
+		if ( $name == self::TABLE && is_a( $value, QueryStatement::class ) ) {
+					return true;
+		}
 
-		if ( $this->typeEL[ $name ] === self::ELEMENT_TYPE_ARRAY )
-			$this->syntaxEL[ $name ][] = $value;
-		else
-			$this->syntaxEL[ $name ] = $value;
+		if ( $this->typeEL[ $name ] === self::ELEMENT_TYPE_ARRAY ) {
+					$this->syntaxEL[ $name ][] = $value;
+		} else {
+					$this->syntaxEL[ $name ] = $value;
+		}
 
 		return true;
 	}
@@ -194,8 +198,9 @@ 
 	 */
 	public function replaceElement( $elementName, $elementValue )
 	{
-		if ( !array_key_exists( $elementName, $this->syntaxEL ) )
-			throw new QueryException( 'Invalid Query property', QueryException::QUERY_ERROR_ELEMENT_NOT_FOUND );
+		if ( !array_key_exists( $elementName, $this->syntaxEL ) ) {
+					throw new QueryException( 'Invalid Query property', QueryException::QUERY_ERROR_ELEMENT_NOT_FOUND );
+		}
 
 		$this->syntaxEL[ $elementName ] = $elementValue;
 	}
@@ -243,11 +248,13 @@ 
 	 */
 	public function bindParamsExpression( $expression, array $params = [], $search = '?' )
 	{
-		if ( !count( $params ) )
-			return $expression;
+		if ( !count( $params ) ) {
+					return $expression;
+		}
 
-		if ( strpos( $expression, $search ) === false )
-			return $expression;
+		if ( strpos( $expression, $search ) === false ) {
+					return $expression;
+		}
 
 		$params = array_slice( $params, 0, substr_count( $expression, $search ) );
 

Spacing +7 added lines, -7 removed lines

@@ -60,7 +60,7 @@ 
 	/**
 	 * @var array
 	 */
-	private static $usedInstanceIds = [];
+	private static $usedInstanceIds = [ ];
 
 	/**
 	 * @var array
@@ -132,7 +132,7 @@ 
 		while ( in_array( $instance, self::$usedInstanceIds ) ) {
 			$instance = QueryHelper::random( 7 );
 		}
-		self::$usedInstanceIds[] = $instance;
+		self::$usedInstanceIds[ ] = $instance;
 
 		return $instance;
 	}
@@ -179,7 +179,7 @@ 
 			return true;
 
 		if ( $this->typeEL[ $name ] === self::ELEMENT_TYPE_ARRAY )
-			$this->syntaxEL[ $name ][] = $value;
+			$this->syntaxEL[ $name ][ ] = $value;
 		else
 			$this->syntaxEL[ $name ] = $value;
 
@@ -241,7 +241,7 @@ 
 	 * @param string $search
 	 * @return string
 	 */
-	public function bindParamsExpression( $expression, array $params = [], $search = '?' )
+	public function bindParamsExpression( $expression, array $params = [ ], $search = '?' )
 	{
 		if ( !count( $params ) )
 			return $expression;
@@ -252,12 +252,12 @@ 
 		$params = array_slice( $params, 0, substr_count( $expression, $search ) );
 
 		$i = 0;
-		$arrayReturn = [];
+		$arrayReturn = [ ];
 		$expressionToArray = explode( $search, $expression );
 
 		foreach ( $expressionToArray as $sub ) {
-			$arrayReturn[] = $sub;
-			$arrayReturn[] = array_key_exists( $i, $params ) ? $this->bindParam( 'exp', $params[ $i ] ) : '';
+			$arrayReturn[ ] = $sub;
+			$arrayReturn[ ] = array_key_exists( $i, $params ) ? $this->bindParam( 'exp', $params[ $i ] ) : '';
 			$i++;
 		}
 

src/DB/DbConnect.php

Braces +12 added lines, -8 removed lines

@@ -42,8 +42,9 @@ 
 	 */
 	public function getMasterConnection()
 	{
-		if ( !is_a( $this->pdoMaster, \PDO::class ) )
-			$this->pdoMaster = $this->connect( $this->config->getMasterDataConnect() );
+		if ( !is_a( $this->pdoMaster, \PDO::class ) ) {
+					$this->pdoMaster = $this->connect( $this->config->getMasterDataConnect() );
+		}
 
 		return $this->pdoMaster;
 	}
@@ -53,11 +54,13 @@ 
 	 */
 	public function getSlaveConnection()
 	{
-		if ( !$this->config->getReplicationEnable() )
-			return $this->getMasterConnection();
+		if ( !$this->config->getReplicationEnable() ) {
+					return $this->getMasterConnection();
+		}
 
-		if ( !is_a( $this->pdoSlave, \PDO::class ) )
-			$this->pdoSlave = $this->connect( $this->config->getSlaveDataConnect() );
+		if ( !is_a( $this->pdoSlave, \PDO::class ) ) {
+					$this->pdoSlave = $this->connect( $this->config->getSlaveDataConnect() );
+		}
 
 		return $this->pdoSlave;
 	}
@@ -70,8 +73,9 @@ 
 	{
 		$statement = trim( strtolower( $statement ) );
 
-		if ( $statement === DbService::QUERY_TYPE_SELECT )
-			return $this->getSlaveConnection();
+		if ( $statement === DbService::QUERY_TYPE_SELECT ) {
+					return $this->getSlaveConnection();
+		}
 
 		return $this->getMasterConnection();
 	}

src/DB/DbLog.php

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/Traits/InsertMultiple.php

Indentation +77 added lines, -77 removed lines

@@ -17,110 +17,110 @@
 trait InsertMultiple
 {
 
-    use Objects;
+	use Objects;
 
 
-    /**
-     * @param $fieldsList
-     * @param array $rowsForInsert
-     * @return $this
-     */
-    public function fromArray($fieldsList, array $rowsForInsert)
-    {
-        $this->setFieldsList($fieldsList);
+	/**
+	 * @param $fieldsList
+	 * @param array $rowsForInsert
+	 * @return $this
+	 */
+	public function fromArray($fieldsList, array $rowsForInsert)
+	{
+		$this->setFieldsList($fieldsList);
 
-        foreach ($rowsForInsert as $row)
-            $this->addSingleRow($row);
+		foreach ($rowsForInsert as $row)
+			$this->addSingleRow($row);
 
-        return $this;
-    }
+		return $this;
+	}
 
 
-    /**
-     * @param $fieldsList
-     * @param QuerySelect $query
-     * @return $this
-     */
-    public function fromQuerySelect($fieldsList, QuerySelect $query)
-    {
-        $this->setFieldsList($fieldsList);
+	/**
+	 * @param $fieldsList
+	 * @param QuerySelect $query
+	 * @return $this
+	 */
+	public function fromQuerySelect($fieldsList, QuerySelect $query)
+	{
+		$this->setFieldsList($fieldsList);
 
-        foreach ($query->getBindParams() as $key => $value)
-            $this->queryStructure->setParams($key, $value);
+		foreach ($query->getBindParams() as $key => $value)
+			$this->queryStructure->setParams($key, $value);
 
-        $this->queryStructure->replaceElement(QueryStructure::SET_FIELDS, $query);
+		$this->queryStructure->replaceElement(QueryStructure::SET_FIELDS, $query);
 
-        return $this;
-    }
+		return $this;
+	}
 
 
-    /**
-     * @param string|array $fieldList
-     */
-    private function setFieldsList($fieldList)
-    {
-        if (!is_array($fieldList))
-            $fieldList = QueryHelper::explode($fieldList);
+	/**
+	 * @param string|array $fieldList
+	 */
+	private function setFieldsList($fieldList)
+	{
+		if (!is_array($fieldList))
+			$fieldList = QueryHelper::explode($fieldList);
 
-        $this->queryStructure->replaceElement(QueryStructure::FIELDS, $fieldList);
+		$this->queryStructure->replaceElement(QueryStructure::FIELDS, $fieldList);
 
-    }
+	}
 
-    /**
-     * @param array $rowValues
-     * @return $this
-     * @throws QueryException
-     */
-    private function addSingleRow(array $rowValues)
-    {
+	/**
+	 * @param array $rowValues
+	 * @return $this
+	 * @throws QueryException
+	 */
+	private function addSingleRow(array $rowValues)
+	{
 
-        if ($this->getNumberOfFields() !== count($rowValues))
-            throw new QueryException('Ivalid number of fields.', QueryException::QUERY_ERROR_INVALID_FIELDS_COUNT);
+		if ($this->getNumberOfFields() !== count($rowValues))
+			throw new QueryException('Ivalid number of fields.', QueryException::QUERY_ERROR_INVALID_FIELDS_COUNT);
 
-        $pdoRowValues = array();
+		$pdoRowValues = array();
 
-        foreach ($rowValues as $value)
-            $pdoRowValues[] = $this->queryStructure->bindParam('value', $value);
+		foreach ($rowValues as $value)
+			$pdoRowValues[] = $this->queryStructure->bindParam('value', $value);
 
-        $pdoRowValuesString = '( ' . QueryHelper::implode($pdoRowValues, ', ') . ' )';
+		$pdoRowValuesString = '( ' . QueryHelper::implode($pdoRowValues, ', ') . ' )';
 
-        $this->queryStructure->setElement(QueryStructure::SET_FIELDS, $pdoRowValuesString);
+		$this->queryStructure->setElement(QueryStructure::SET_FIELDS, $pdoRowValuesString);
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * @return string
-     */
-    private function getInsertMultipleRowsSyntax()
-    {
-        if (is_a($this->queryStructure->getElement(QueryStructure::SET_FIELDS), QuerySelect::class))
-            return $this->getSyntaxWithSelect();
+	/**
+	 * @return string
+	 */
+	private function getInsertMultipleRowsSyntax()
+	{
+		if (is_a($this->queryStructure->getElement(QueryStructure::SET_FIELDS), QuerySelect::class))
+			return $this->getSyntaxWithSelect();
 
-        $fields = '( ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::FIELDS), ', ') . ' )';
-        $values = QueryHelper::implode($this->queryStructure->getElement(QueryStructure::SET_FIELDS), ', ');
+		$fields = '( ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::FIELDS), ', ') . ' )';
+		$values = QueryHelper::implode($this->queryStructure->getElement(QueryStructure::SET_FIELDS), ', ');
 
-        return $fields . ' VALUES ' . $values;
-    }
+		return $fields . ' VALUES ' . $values;
+	}
 
 
-    /**
-     * @return string
-     */
-    private function getSyntaxWithSelect()
-    {
-        $fields = '( ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::FIELDS), ', ') . ' )';
+	/**
+	 * @return string
+	 */
+	private function getSyntaxWithSelect()
+	{
+		$fields = '( ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::FIELDS), ', ') . ' )';
 
-        return $fields . ' ' . $this->queryStructure->getElement(QueryStructure::SET_FIELDS)->getSyntax();
-    }
+		return $fields . ' ' . $this->queryStructure->getElement(QueryStructure::SET_FIELDS)->getSyntax();
+	}
 
-    /**
-     * @return int
-     */
-    private function getNumberOfFields()
-    {
-        return count($this->queryStructure->getElement(QueryStructure::FIELDS));
-    }
+	/**
+	 * @return int
+	 */
+	private function getNumberOfFields()
+	{
+		return count($this->queryStructure->getElement(QueryStructure::FIELDS));
+	}
 
 
 }
\ No newline at end of file

Spacing +26 added lines, -26 removed lines

@@ -25,12 +25,12 @@ 
      * @param array $rowsForInsert
      * @return $this
      */
-    public function fromArray($fieldsList, array $rowsForInsert)
+    public function fromArray( $fieldsList, array $rowsForInsert )
     {
-        $this->setFieldsList($fieldsList);
+        $this->setFieldsList( $fieldsList );
 
-        foreach ($rowsForInsert as $row)
-            $this->addSingleRow($row);
+        foreach ( $rowsForInsert as $row )
+            $this->addSingleRow( $row );
 
         return $this;
     }
@@ -41,14 +41,14 @@ 
      * @param QuerySelect $query
      * @return $this
      */
-    public function fromQuerySelect($fieldsList, QuerySelect $query)
+    public function fromQuerySelect( $fieldsList, QuerySelect $query )
     {
-        $this->setFieldsList($fieldsList);
+        $this->setFieldsList( $fieldsList );
 
-        foreach ($query->getBindParams() as $key => $value)
-            $this->queryStructure->setParams($key, $value);
+        foreach ( $query->getBindParams() as $key => $value )
+            $this->queryStructure->setParams( $key, $value );
 
-        $this->queryStructure->replaceElement(QueryStructure::SET_FIELDS, $query);
+        $this->queryStructure->replaceElement( QueryStructure::SET_FIELDS, $query );
 
         return $this;
     }
@@ -57,12 +57,12 @@ 
     /**
      * @param string|array $fieldList
      */
-    private function setFieldsList($fieldList)
+    private function setFieldsList( $fieldList )
     {
-        if (!is_array($fieldList))
-            $fieldList = QueryHelper::explode($fieldList);
+        if ( !is_array( $fieldList ) )
+            $fieldList = QueryHelper::explode( $fieldList );
 
-        $this->queryStructure->replaceElement(QueryStructure::FIELDS, $fieldList);
+        $this->queryStructure->replaceElement( QueryStructure::FIELDS, $fieldList );
 
     }
 
@@ -71,20 +71,20 @@ 
      * @return $this
      * @throws QueryException
      */
-    private function addSingleRow(array $rowValues)
+    private function addSingleRow( array $rowValues )
     {
 
-        if ($this->getNumberOfFields() !== count($rowValues))
-            throw new QueryException('Ivalid number of fields.', QueryException::QUERY_ERROR_INVALID_FIELDS_COUNT);
+        if ( $this->getNumberOfFields() !== count( $rowValues ) )
+            throw new QueryException( 'Ivalid number of fields.', QueryException::QUERY_ERROR_INVALID_FIELDS_COUNT );
 
         $pdoRowValues = array();
 
-        foreach ($rowValues as $value)
-            $pdoRowValues[] = $this->queryStructure->bindParam('value', $value);
+        foreach ( $rowValues as $value )
+            $pdoRowValues[ ] = $this->queryStructure->bindParam( 'value', $value );
 
-        $pdoRowValuesString = '( ' . QueryHelper::implode($pdoRowValues, ', ') . ' )';
+        $pdoRowValuesString = '( ' . QueryHelper::implode( $pdoRowValues, ', ' ) . ' )';
 
-        $this->queryStructure->setElement(QueryStructure::SET_FIELDS, $pdoRowValuesString);
+        $this->queryStructure->setElement( QueryStructure::SET_FIELDS, $pdoRowValuesString );
 
         return $this;
     }
@@ -94,11 +94,11 @@ 
      */
     private function getInsertMultipleRowsSyntax()
     {
-        if (is_a($this->queryStructure->getElement(QueryStructure::SET_FIELDS), QuerySelect::class))
+        if ( is_a( $this->queryStructure->getElement( QueryStructure::SET_FIELDS ), QuerySelect::class ) )
             return $this->getSyntaxWithSelect();
 
-        $fields = '( ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::FIELDS), ', ') . ' )';
-        $values = QueryHelper::implode($this->queryStructure->getElement(QueryStructure::SET_FIELDS), ', ');
+        $fields = '( ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::FIELDS ), ', ' ) . ' )';
+        $values = QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::SET_FIELDS ), ', ' );
 
         return $fields . ' VALUES ' . $values;
     }
@@ -109,9 +109,9 @@ 
      */
     private function getSyntaxWithSelect()
     {
-        $fields = '( ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::FIELDS), ', ') . ' )';
+        $fields = '( ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::FIELDS ), ', ' ) . ' )';
 
-        return $fields . ' ' . $this->queryStructure->getElement(QueryStructure::SET_FIELDS)->getSyntax();
+        return $fields . ' ' . $this->queryStructure->getElement( QueryStructure::SET_FIELDS )->getSyntax();
     }
 
     /**
@@ -119,7 +119,7 @@ 
      */
     private function getNumberOfFields()
     {
-        return count($this->queryStructure->getElement(QueryStructure::FIELDS));
+        return count( $this->queryStructure->getElement( QueryStructure::FIELDS ) );
     }
 
 

Braces +18 added lines, -12 removed lines

@@ -29,8 +29,9 @@ 
     {
         $this->setFieldsList($fieldsList);
 
-        foreach ($rowsForInsert as $row)
-            $this->addSingleRow($row);
+        foreach ($rowsForInsert as $row) {
+                    $this->addSingleRow($row);
+        }
 
         return $this;
     }
@@ -45,8 +46,9 @@ 
     {
         $this->setFieldsList($fieldsList);
 
-        foreach ($query->getBindParams() as $key => $value)
-            $this->queryStructure->setParams($key, $value);
+        foreach ($query->getBindParams() as $key => $value) {
+                    $this->queryStructure->setParams($key, $value);
+        }
 
         $this->queryStructure->replaceElement(QueryStructure::SET_FIELDS, $query);
 
@@ -59,8 +61,9 @@ 
      */
     private function setFieldsList($fieldList)
     {
-        if (!is_array($fieldList))
-            $fieldList = QueryHelper::explode($fieldList);
+        if (!is_array($fieldList)) {
+                    $fieldList = QueryHelper::explode($fieldList);
+        }
 
         $this->queryStructure->replaceElement(QueryStructure::FIELDS, $fieldList);
 
@@ -74,13 +77,15 @@ 
     private function addSingleRow(array $rowValues)
     {
 
-        if ($this->getNumberOfFields() !== count($rowValues))
-            throw new QueryException('Ivalid number of fields.', QueryException::QUERY_ERROR_INVALID_FIELDS_COUNT);
+        if ($this->getNumberOfFields() !== count($rowValues)) {
+                    throw new QueryException('Ivalid number of fields.', QueryException::QUERY_ERROR_INVALID_FIELDS_COUNT);
+        }
 
         $pdoRowValues = array();
 
-        foreach ($rowValues as $value)
-            $pdoRowValues[] = $this->queryStructure->bindParam('value', $value);
+        foreach ($rowValues as $value) {
+                    $pdoRowValues[] = $this->queryStructure->bindParam('value', $value);
+        }
 
         $pdoRowValuesString = '( ' . QueryHelper::implode($pdoRowValues, ', ') . ' )';
 
@@ -94,8 +99,9 @@ 
      */
     private function getInsertMultipleRowsSyntax()
     {
-        if (is_a($this->queryStructure->getElement(QueryStructure::SET_FIELDS), QuerySelect::class))
-            return $this->getSyntaxWithSelect();
+        if (is_a($this->queryStructure->getElement(QueryStructure::SET_FIELDS), QuerySelect::class)) {
+                    return $this->getSyntaxWithSelect();
+        }
 
         $fields = '( ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::FIELDS), ', ') . ' )';
         $values = QueryHelper::implode($this->queryStructure->getElement(QueryStructure::SET_FIELDS), ', ');

src/Traits/SelectFields.php

Indentation +42 added lines, -42 removed lines

@@ -14,61 +14,61 @@
 
 trait SelectFields
 {
-    use Objects;
+	use Objects;
 
 
-    /**
-     * @param string|array $fields
-     * @return $this
-     * @throws QueryException
-     */
-    public function fields($fields)
-    {
+	/**
+	 * @param string|array $fields
+	 * @return $this
+	 * @throws QueryException
+	 */
+	public function fields($fields)
+	{
 
-        switch (gettype($fields)) {
-            case QueryStructure::ELEMENT_TYPE_ARRAY:
+		switch (gettype($fields)) {
+			case QueryStructure::ELEMENT_TYPE_ARRAY:
 
-                $fields = $this->prepareArrayFields($fields);
+				$fields = $this->prepareArrayFields($fields);
 
-                if (count($fields))
-                    $this->queryStructure->setElement(QueryStructure::FIELDS, implode(', ', $fields)); else
-                    $this->queryStructure->setElement(QueryStructure::FIELDS, '*');
-                break;
+				if (count($fields))
+					$this->queryStructure->setElement(QueryStructure::FIELDS, implode(', ', $fields)); else
+					$this->queryStructure->setElement(QueryStructure::FIELDS, '*');
+				break;
 
-            case QueryStructure::ELEMENT_TYPE_STRING:
+			case QueryStructure::ELEMENT_TYPE_STRING:
 
-                $fields = trim($fields);
-                if ('' !== $fields)
-                    $this->queryStructure->setElement(QueryStructure::FIELDS, $fields); else
-                    $this->queryStructure->setElement(QueryStructure::FIELDS, '*');
-                break;
+				$fields = trim($fields);
+				if ('' !== $fields)
+					$this->queryStructure->setElement(QueryStructure::FIELDS, $fields); else
+					$this->queryStructure->setElement(QueryStructure::FIELDS, '*');
+				break;
 
-            default:
-                throw new QueryException('Invalid fields parameter type', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY);
+			default:
+				throw new QueryException('Invalid fields parameter type', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY);
 
-        }
+		}
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * @param array $fieldsArray
-     * @return array
-     * @throws QueryException
-     */
-    private function prepareArrayFields($fieldsArray = array())
-    {
-        $prepareArray = [];
+	/**
+	 * @param array $fieldsArray
+	 * @return array
+	 * @throws QueryException
+	 */
+	private function prepareArrayFields($fieldsArray = array())
+	{
+		$prepareArray = [];
 
-        foreach ($fieldsArray as $field) {
-            if (gettype($field) !== QueryStructure::ELEMENT_TYPE_STRING)
-                throw new QueryException('Invalid select field type!', QueryException::QUERY_ERROR_SELECT_INVALID_FIELD);
+		foreach ($fieldsArray as $field) {
+			if (gettype($field) !== QueryStructure::ELEMENT_TYPE_STRING)
+				throw new QueryException('Invalid select field type!', QueryException::QUERY_ERROR_SELECT_INVALID_FIELD);
 
-            if ('' !== trim($field))
-                $prepareArray[] = trim($field);
-        }
+			if ('' !== trim($field))
+				$prepareArray[] = trim($field);
+		}
 
-        return $prepareArray;
-    }
+		return $prepareArray;
+	}
 
 }
\ No newline at end of file

Spacing +18 added lines, -18 removed lines

@@ -22,29 +22,29 @@ 
      * @return $this
      * @throws QueryException
      */
-    public function fields($fields)
+    public function fields( $fields )
     {
 
-        switch (gettype($fields)) {
+        switch ( gettype( $fields ) ) {
             case QueryStructure::ELEMENT_TYPE_ARRAY:
 
-                $fields = $this->prepareArrayFields($fields);
+                $fields = $this->prepareArrayFields( $fields );
 
-                if (count($fields))
-                    $this->queryStructure->setElement(QueryStructure::FIELDS, implode(', ', $fields)); else
-                    $this->queryStructure->setElement(QueryStructure::FIELDS, '*');
+                if ( count( $fields ) )
+                    $this->queryStructure->setElement( QueryStructure::FIELDS, implode( ', ', $fields ) ); else
+                    $this->queryStructure->setElement( QueryStructure::FIELDS, '*' );
                 break;
 
             case QueryStructure::ELEMENT_TYPE_STRING:
 
-                $fields = trim($fields);
-                if ('' !== $fields)
-                    $this->queryStructure->setElement(QueryStructure::FIELDS, $fields); else
-                    $this->queryStructure->setElement(QueryStructure::FIELDS, '*');
+                $fields = trim( $fields );
+                if ( '' !== $fields )
+                    $this->queryStructure->setElement( QueryStructure::FIELDS, $fields ); else
+                    $this->queryStructure->setElement( QueryStructure::FIELDS, '*' );
                 break;
 
             default:
-                throw new QueryException('Invalid fields parameter type', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY);
+                throw new QueryException( 'Invalid fields parameter type', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY );
 
         }
 
@@ -56,16 +56,16 @@ 
      * @return array
      * @throws QueryException
      */
-    private function prepareArrayFields($fieldsArray = array())
+    private function prepareArrayFields( $fieldsArray = array() )
     {
-        $prepareArray = [];
+        $prepareArray = [ ];
 
-        foreach ($fieldsArray as $field) {
-            if (gettype($field) !== QueryStructure::ELEMENT_TYPE_STRING)
-                throw new QueryException('Invalid select field type!', QueryException::QUERY_ERROR_SELECT_INVALID_FIELD);
+        foreach ( $fieldsArray as $field ) {
+            if ( gettype( $field ) !== QueryStructure::ELEMENT_TYPE_STRING )
+                throw new QueryException( 'Invalid select field type!', QueryException::QUERY_ERROR_SELECT_INVALID_FIELD );
 
-            if ('' !== trim($field))
-                $prepareArray[] = trim($field);
+            if ( '' !== trim( $field ) )
+                $prepareArray[ ] = trim( $field );
         }
 
         return $prepareArray;

Braces +16 added lines, -10 removed lines

@@ -30,17 +30,21 @@ 
 
                 $fields = $this->prepareArrayFields($fields);
 
-                if (count($fields))
-                    $this->queryStructure->setElement(QueryStructure::FIELDS, implode(', ', $fields)); else
-                    $this->queryStructure->setElement(QueryStructure::FIELDS, '*');
+                if (count($fields)) {
+                                    $this->queryStructure->setElement(QueryStructure::FIELDS, implode(', ', $fields));
+                } else {
+                                        $this->queryStructure->setElement(QueryStructure::FIELDS, '*');
+                    }
                 break;
 
             case QueryStructure::ELEMENT_TYPE_STRING:
 
                 $fields = trim($fields);
-                if ('' !== $fields)
-                    $this->queryStructure->setElement(QueryStructure::FIELDS, $fields); else
-                    $this->queryStructure->setElement(QueryStructure::FIELDS, '*');
+                if ('' !== $fields) {
+                                    $this->queryStructure->setElement(QueryStructure::FIELDS, $fields);
+                } else {
+                                        $this->queryStructure->setElement(QueryStructure::FIELDS, '*');
+                    }
                 break;
 
             default:
@@ -61,11 +65,13 @@ 
         $prepareArray = [];
 
         foreach ($fieldsArray as $field) {
-            if (gettype($field) !== QueryStructure::ELEMENT_TYPE_STRING)
-                throw new QueryException('Invalid select field type!', QueryException::QUERY_ERROR_SELECT_INVALID_FIELD);
+            if (gettype($field) !== QueryStructure::ELEMENT_TYPE_STRING) {
+                            throw new QueryException('Invalid select field type!', QueryException::QUERY_ERROR_SELECT_INVALID_FIELD);
+            }
 
-            if ('' !== trim($field))
-                $prepareArray[] = trim($field);
+            if ('' !== trim($field)) {
+                            $prepareArray[] = trim($field);
+            }
         }
 
         return $prepareArray;

src/Traits/GroupBy.php

Indentation +47 added lines, -47 removed lines

@@ -15,68 +15,68 @@
 trait GroupBy
 {
 
-    use Objects;
+	use Objects;
 
 
-    /**
-     * @param $column
-     * @param array $allowedColumns
-     * @return $this
-     * @throws QueryException
-     */
-    public function groupBy($column, array $allowedColumns = [])
-    {
-        $column = trim($column);
+	/**
+	 * @param $column
+	 * @param array $allowedColumns
+	 * @return $this
+	 * @throws QueryException
+	 */
+	public function groupBy($column, array $allowedColumns = [])
+	{
+		$column = trim($column);
 
-        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);
 
-        $this->queryStructure->setElement(QueryStructure::GROUP_BY, $column);
+		$this->queryStructure->setElement(QueryStructure::GROUP_BY, $column);
 
-        return $this;
-    }
+		return $this;
+	}
 
 
-    /**
-     * @param $column
-     * @param array $allowedColumns
-     * @return $this
-     * @throws QueryException
-     */
-    public function groupByDesc($column, array $allowedColumns = [])
-    {
-        $column = trim($column);
+	/**
+	 * @param $column
+	 * @param array $allowedColumns
+	 * @return $this
+	 * @throws QueryException
+	 */
+	public function groupByDesc($column, array $allowedColumns = [])
+	{
+		$column = trim($column);
 
-        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);
 
-        $this->queryStructure->setElement(QueryStructure::GROUP_BY, $column . ' DESC');
+		$this->queryStructure->setElement(QueryStructure::GROUP_BY, $column . ' DESC');
 
-        return $this;
-    }
+		return $this;
+	}
 
 
-    /**
-     * @param $expression
-     * @return $this
-     */
-    public function groupByExpression($expression)
-    {
-        $this->queryStructure->setElement(QueryStructure::GROUP_BY, $expression);
+	/**
+	 * @param $expression
+	 * @return $this
+	 */
+	public function groupByExpression($expression)
+	{
+		$this->queryStructure->setElement(QueryStructure::GROUP_BY, $expression);
 
-        return $this;
-    }
+		return $this;
+	}
 
 
-    /**
-     * @return string
-     */
-    private function getGroupBySyntax()
-    {
-        if (count($this->queryStructure->getElement(QueryStructure::GROUP_BY)))
-            return 'GROUP BY ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::GROUP_BY), ', ');
+	/**
+	 * @return string
+	 */
+	private function getGroupBySyntax()
+	{
+		if (count($this->queryStructure->getElement(QueryStructure::GROUP_BY)))
+			return 'GROUP BY ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::GROUP_BY), ', ');
 
-        return '';
-    }
+		return '';
+	}
 
 }
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -24,14 +24,14 @@ 
      * @return $this
      * @throws QueryException
      */
-    public function groupBy($column, array $allowedColumns = [])
+    public function groupBy( $column, array $allowedColumns = [ ] )
     {
-        $column = trim($column);
+        $column = trim( $column );
 
-        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 );
 
-        $this->queryStructure->setElement(QueryStructure::GROUP_BY, $column);
+        $this->queryStructure->setElement( QueryStructure::GROUP_BY, $column );
 
         return $this;
     }
@@ -43,14 +43,14 @@ 
      * @return $this
      * @throws QueryException
      */
-    public function groupByDesc($column, array $allowedColumns = [])
+    public function groupByDesc( $column, array $allowedColumns = [ ] )
     {
-        $column = trim($column);
+        $column = trim( $column );
 
-        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 );
 
-        $this->queryStructure->setElement(QueryStructure::GROUP_BY, $column . ' DESC');
+        $this->queryStructure->setElement( QueryStructure::GROUP_BY, $column . ' DESC' );
 
         return $this;
     }
@@ -60,9 +60,9 @@ 
      * @param $expression
      * @return $this
      */
-    public function groupByExpression($expression)
+    public function groupByExpression( $expression )
     {
-        $this->queryStructure->setElement(QueryStructure::GROUP_BY, $expression);
+        $this->queryStructure->setElement( QueryStructure::GROUP_BY, $expression );
 
         return $this;
     }
@@ -73,8 +73,8 @@ 
      */
     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 '';
     }

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 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);
+        }
 
         $this->queryStructure->setElement(QueryStructure::GROUP_BY, $column);
 
@@ -47,8 +48,9 @@ 
     {
         $column = trim($column);
 
-        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);
+        }
 
         $this->queryStructure->setElement(QueryStructure::GROUP_BY, $column . ' DESC');
 
@@ -73,8 +75,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/Traits/Replacement.php

Indentation +35 added lines, -35 removed lines

@@ -16,40 +16,40 @@
 trait Replacement
 {
 
-    use Objects;
-
-    /**
-     * @param $syntax
-     * @param int $withReplacement
-     * @return mixed|string
-     */
-    private function getSyntaxReplace($syntax, $withReplacement = QueryStatementInterface::REPLACEMENT_NONE)
-    {
-        $syntax = QueryHelper::clearMultipleSpaces($syntax);
-
-        if (!$withReplacement)
-            return $syntax;
-
-        return $this->replaceValues($syntax);
-    }
-
-    /**
-     * @param $syntax
-     * @return string
-     */
-    private function replaceValues($syntax)
-    {
-        $bindParams = $this->queryStructure->getElement(QueryStructure::BIND_PARAMS);
-        $search = array();
-        $replace = array();
-        foreach ($bindParams as $key => $value) {
-            $search[] = ':' . $key;
-            $replace[] = DbConnect::getInstance()->quote($value);
-        }
-        $syntax = str_ireplace($search, $replace, $syntax);
-
-        return $syntax;
-
-    }
+	use Objects;
+
+	/**
+	 * @param $syntax
+	 * @param int $withReplacement
+	 * @return mixed|string
+	 */
+	private function getSyntaxReplace($syntax, $withReplacement = QueryStatementInterface::REPLACEMENT_NONE)
+	{
+		$syntax = QueryHelper::clearMultipleSpaces($syntax);
+
+		if (!$withReplacement)
+			return $syntax;
+
+		return $this->replaceValues($syntax);
+	}
+
+	/**
+	 * @param $syntax
+	 * @return string
+	 */
+	private function replaceValues($syntax)
+	{
+		$bindParams = $this->queryStructure->getElement(QueryStructure::BIND_PARAMS);
+		$search = array();
+		$replace = array();
+		foreach ($bindParams as $key => $value) {
+			$search[] = ':' . $key;
+			$replace[] = DbConnect::getInstance()->quote($value);
+		}
+		$syntax = str_ireplace($search, $replace, $syntax);
+
+		return $syntax;
+
+	}
 
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -23,30 +23,30 @@
      * @param int $withReplacement
      * @return mixed|string
      */
-    private function getSyntaxReplace($syntax, $withReplacement = QueryStatementInterface::REPLACEMENT_NONE)
+    private function getSyntaxReplace( $syntax, $withReplacement = QueryStatementInterface::REPLACEMENT_NONE )
     {
-        $syntax = QueryHelper::clearMultipleSpaces($syntax);
+        $syntax = QueryHelper::clearMultipleSpaces( $syntax );
 
-        if (!$withReplacement)
+        if ( !$withReplacement )
             return $syntax;
 
-        return $this->replaceValues($syntax);
+        return $this->replaceValues( $syntax );
     }
 
     /**
      * @param $syntax
      * @return string
      */
-    private function replaceValues($syntax)
+    private function replaceValues( $syntax )
     {
-        $bindParams = $this->queryStructure->getElement(QueryStructure::BIND_PARAMS);
+        $bindParams = $this->queryStructure->getElement( QueryStructure::BIND_PARAMS );
         $search = array();
         $replace = array();
-        foreach ($bindParams as $key => $value) {
-            $search[] = ':' . $key;
-            $replace[] = DbConnect::getInstance()->quote($value);
+        foreach ( $bindParams as $key => $value ) {
+            $search[ ] = ':' . $key;
+            $replace[ ] = DbConnect::getInstance()->quote( $value );
         }
-        $syntax = str_ireplace($search, $replace, $syntax);
+        $syntax = str_ireplace( $search, $replace, $syntax );
 
         return $syntax;
 

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
     {
         $syntax = QueryHelper::clearMultipleSpaces($syntax);
 
-        if (!$withReplacement)
-            return $syntax;
+        if (!$withReplacement) {
+                    return $syntax;
+        }
 
         return $this->replaceValues($syntax);
     }

src/Traits/Distinct.php

Indentation +54 added lines, -54 removed lines

@@ -15,60 +15,60 @@
 trait Distinct
 {
 
-    use Objects;
-
-
-    /**
-     * @return $this
-     */
-    public function all()
-    {
-        $this->queryStructure->setElement(QueryStructure::DISTINCT, 0);
-
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    public function distinct()
-    {
-        $this->queryStructure->setElement(QueryStructure::DISTINCT, 1);
-
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    public function distinctRow()
-    {
-        $this->queryStructure->setElement(QueryStructure::DISTINCT, 2);
-
-        return $this;
-    }
-
-
-    /**
-     * @return string
-     * @throws QueryException
-     */
-    private function getDistinctSyntax()
-    {
-        $useDistinct = $this->queryStructure->getElement(QueryStructure::DISTINCT);
-
-        switch ($useDistinct) {
-            case 0:
-                return '';
-            case 1:
-                return 'DISTINCT';
-            case 2:
-                return 'DISTINCTROW';
-            default:
-                throw new QueryException('Invalid distinct type', QueryException::QUERY_ERROR_INVALID_DISTINCT);
-        }
-
-    }
+	use Objects;
+
+
+	/**
+	 * @return $this
+	 */
+	public function all()
+	{
+		$this->queryStructure->setElement(QueryStructure::DISTINCT, 0);
+
+		return $this;
+	}
+
+	/**
+	 * @return $this
+	 */
+	public function distinct()
+	{
+		$this->queryStructure->setElement(QueryStructure::DISTINCT, 1);
+
+		return $this;
+	}
+
+	/**
+	 * @return $this
+	 */
+	public function distinctRow()
+	{
+		$this->queryStructure->setElement(QueryStructure::DISTINCT, 2);
+
+		return $this;
+	}
+
+
+	/**
+	 * @return string
+	 * @throws QueryException
+	 */
+	private function getDistinctSyntax()
+	{
+		$useDistinct = $this->queryStructure->getElement(QueryStructure::DISTINCT);
+
+		switch ($useDistinct) {
+			case 0:
+				return '';
+			case 1:
+				return 'DISTINCT';
+			case 2:
+				return 'DISTINCTROW';
+			default:
+				throw new QueryException('Invalid distinct type', QueryException::QUERY_ERROR_INVALID_DISTINCT);
+		}
+
+	}
 
 
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
      */
     public function all()
     {
-        $this->queryStructure->setElement(QueryStructure::DISTINCT, 0);
+        $this->queryStructure->setElement( QueryStructure::DISTINCT, 0 );
 
         return $this;
     }
@@ -33,7 +33,7 @@ 
      */
     public function distinct()
     {
-        $this->queryStructure->setElement(QueryStructure::DISTINCT, 1);
+        $this->queryStructure->setElement( QueryStructure::DISTINCT, 1 );
 
         return $this;
     }
@@ -43,7 +43,7 @@ 
      */
     public function distinctRow()
     {
-        $this->queryStructure->setElement(QueryStructure::DISTINCT, 2);
+        $this->queryStructure->setElement( QueryStructure::DISTINCT, 2 );
 
         return $this;
     }
@@ -55,9 +55,9 @@ 
      */
     private function getDistinctSyntax()
     {
-        $useDistinct = $this->queryStructure->getElement(QueryStructure::DISTINCT);
+        $useDistinct = $this->queryStructure->getElement( QueryStructure::DISTINCT );
 
-        switch ($useDistinct) {
+        switch ( $useDistinct ) {
             case 0:
                 return '';
             case 1:
@@ -65,7 +65,7 @@ 
             case 2:
                 return 'DISTINCTROW';
             default:
-                throw new QueryException('Invalid distinct type', QueryException::QUERY_ERROR_INVALID_DISTINCT);
+                throw new QueryException( 'Invalid distinct type', QueryException::QUERY_ERROR_INVALID_DISTINCT );
         }
 
     }

src/Traits/LowPriority.php

Indentation +9 added lines, -9 removed lines

@@ -14,16 +14,16 @@
 trait LowPriority
 {
 
-    use Objects;
+	use Objects;
 
-    /**
-     * @return $this
-     */
-    public function lowPriority()
-    {
-        $this->queryStructure->setElement(QueryStructure::PRIORITY, 'LOW_PRIORITY');
+	/**
+	 * @return $this
+	 */
+	public function lowPriority()
+	{
+		$this->queryStructure->setElement(QueryStructure::PRIORITY, 'LOW_PRIORITY');
 
-        return $this;
-    }
+		return $this;
+	}
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
      */
     public function lowPriority()
     {
-        $this->queryStructure->setElement(QueryStructure::PRIORITY, 'LOW_PRIORITY');
+        $this->queryStructure->setElement( QueryStructure::PRIORITY, 'LOW_PRIORITY' );
 
         return $this;
     }