adumitru68 / QueryBuilder

sample/autoloader.php

Indentation +6 added lines, -6 removed lines

@@ -10,14 +10,14 @@
 /**
  * @param $class
  */
-    function($class) {
+	function($class) {
 
-        $nameSpace = str_replace('\\', '/', trim($class, '\\')) . '.php';
-        $nameSpace = str_replace('Qpdb/QueryBuilder/', '', $nameSpace);
-        $includeFile = __DIR__ . '/../src/' . $nameSpace;
+		$nameSpace = str_replace('\\', '/', trim($class, '\\')) . '.php';
+		$nameSpace = str_replace('Qpdb/QueryBuilder/', '', $nameSpace);
+		$includeFile = __DIR__ . '/../src/' . $nameSpace;
 
-        require_once($includeFile);
+		require_once($includeFile);
 
-    }
+	}
 
 );
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -10,13 +10,13 @@
 /**
  * @param $class
  */
-    function($class) {
+    function( $class ) {
 
-        $nameSpace = str_replace('\\', '/', trim($class, '\\')) . '.php';
-        $nameSpace = str_replace('Qpdb/QueryBuilder/', '', $nameSpace);
+        $nameSpace = str_replace( '\\', '/', trim( $class, '\\' ) ) . '.php';
+        $nameSpace = str_replace( 'Qpdb/QueryBuilder/', '', $nameSpace );
         $includeFile = __DIR__ . '/../src/' . $nameSpace;
 
-        require_once($includeFile);
+        require_once( $includeFile );
 
     }
 

sample/select.php

Spacing +6 added lines, -6 removed lines

@@ -8,13 +8,13 @@
 
 use Qpdb\QueryBuilder\QueryBuild;
 
-include_once $_SERVER['DOCUMENT_ROOT'] . '/vendor/autoload.php';
+include_once $_SERVER[ 'DOCUMENT_ROOT' ] . '/vendor/autoload.php';
 
 
-$query = QueryBuild::select('employees22')->fields('lastName, jobTitle, officeCode')->whereEqual('jobTitle', "Sales Rep")->whereIn('officeCode', [2, 3, 4]);
+$query = QueryBuild::select( 'employees22' )->fields( 'lastName, jobTitle, officeCode' )->whereEqual( 'jobTitle', "Sales Rep" )->whereIn( 'officeCode', [ 2, 3, 4 ] );
 
 
-echo "<pre>" . print_r($query->getSyntax(), 1) . "</pre>";
-echo "<pre>" . print_r($query->getBindParams(), 1) . "</pre>";
-echo "<pre>" . print_r($query->getSyntax(1), 1) . "</pre>";
-echo "<pre>" . print_r($query->execute(), 1) . "</pre>";
\ No newline at end of file
+echo "<pre>" . print_r( $query->getSyntax(), 1 ) . "</pre>";
+echo "<pre>" . print_r( $query->getBindParams(), 1 ) . "</pre>";
+echo "<pre>" . print_r( $query->getSyntax( 1 ), 1 ) . "</pre>";
+echo "<pre>" . print_r( $query->execute(), 1 ) . "</pre>";
\ No newline at end of file

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/Having.php

Indentation +332 added lines, -332 removed lines

@@ -13,337 +13,337 @@
 trait Having
 {
 
-    use Objects;
-
-
-    /**
-     * @param $field
-     * @param $value
-     * @param $glue
-     * @return $this
-     */
-    public function havingEqual($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, '='), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingEqual($field, $value)
-    {
-        return $this->having(array($field, $value, '='), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingNotEqual($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, '<>'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingNotEqual($field, $value)
-    {
-        return $this->having(array($field, $value, '<>'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingLessThan($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, '<'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingLessThan($field, $value)
-    {
-        return $this->having(array($field, $value, '<'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingLessThanOrEqual($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, '<='), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingLessThanOrEqual($field, $value)
-    {
-        return $this->having(array($field, $value, '<='), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingGreaterThan($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, '>'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingGreaterThan($field, $value)
-    {
-        return $this->having(array($field, $value, '>'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingGreaterThanOrEqual($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, '>='), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingGreaterThanOrEqual($field, $value)
-    {
-        return $this->having(array($field, $value, '>='), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingLike($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, 'LIKE'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingLike($field, $value)
-    {
-        return $this->having(array($field, $value, 'LIKE'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingNotLike($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, 'NOT LIKE'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingNotLike($field, $value)
-    {
-        return $this->having(array($field, $value, 'NOT LIKE'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $min
-     * @param $max
-     * @param string $glue
-     * @return $this
-     */
-    public function havingBetween($field, $min, $max, $glue = 'AND')
-    {
-        return $this->having(array($field, array($min, $max), 'BETWEEN'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $min
-     * @param $max
-     * @return $this
-     */
-    public function orHavingBetween($field, $min, $max)
-    {
-        return $this->having(array($field, array($min, $max), 'BETWEEN'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $min
-     * @param $max
-     * @param string $glue
-     * @return $this
-     */
-    public function havingNotBetween($field, $min, $max, $glue = 'AND')
-    {
-        return $this->having(array($field, array($min, $max), 'NOT BETWEEN'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $min
-     * @param $max
-     * @return $this
-     */
-    public function orHavingNotBetween($field, $min, $max)
-    {
-        return $this->having(array($field, array($min, $max), 'NOT BETWEEN'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingIn($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, 'IN'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingIn($field, $value)
-    {
-        return $this->having(array($field, $value, 'IN'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingNotIn($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, 'NOT IN'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingNotIn($field, $value)
-    {
-        return $this->having(array($field, $value, 'NOT IN'), 'OR');
-    }
-
-    /**
-     * @param $whereString
-     * @param array $bindParams
-     * @param string $glue
-     * @return $this
-     */
-    public function havingExpression($whereString, array $bindParams = [], $glue = 'AND')
-    {
-        $whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
-
-        return $this->having($whereString, $glue);
-    }
-
-    /**
-     * @param $whereString
-     * @param array $bindParams
-     * @return $this
-     */
-    public function orHavingExpression($whereString, array $bindParams = [])
-    {
-        $whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
-
-        return $this->having($whereString, 'OR');
-    }
-
-    /**
-     * @return $this
-     */
-    public function havingInvertResult()
-    {
-        $this->queryStructure->setElement(QueryStructure::HAVING_INVERT, 1);
-
-        return $this;
-    }
-
-    /**
-     * @param string $glue
-     * @return $this
-     */
-    public function havingGroup($glue = 'AND')
-    {
-        $this->queryStructure->setElement(QueryStructure::HAVING, array('glue' => $glue, 'body' => '(', 'type' => 'start_where_group'));
-
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    public function orHavingGroup()
-    {
-        return $this->havingGroup('OR');
-    }
-
-    /**
-     * @return $this
-     */
-    public function havingGroupEnd()
-    {
-        $this->queryStructure->setElement(QueryStructure::HAVING, array('glue' => '', 'body' => ')', 'type' => 'end_where_group'));
-
-        return $this;
-    }
-
-    /**
-     * @param $param
-     * @param string $glue
-     * @return $this
-     */
-    private function having($param, $glue = 'AND')
-    {
-        return $this->createCondition($param, $glue, QueryStructure::HAVING);
-    }
+	use Objects;
+
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param $glue
+	 * @return $this
+	 */
+	public function havingEqual($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, '='), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingEqual($field, $value)
+	{
+		return $this->having(array($field, $value, '='), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingNotEqual($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, '<>'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingNotEqual($field, $value)
+	{
+		return $this->having(array($field, $value, '<>'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingLessThan($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, '<'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingLessThan($field, $value)
+	{
+		return $this->having(array($field, $value, '<'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingLessThanOrEqual($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, '<='), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingLessThanOrEqual($field, $value)
+	{
+		return $this->having(array($field, $value, '<='), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingGreaterThan($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, '>'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingGreaterThan($field, $value)
+	{
+		return $this->having(array($field, $value, '>'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingGreaterThanOrEqual($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, '>='), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingGreaterThanOrEqual($field, $value)
+	{
+		return $this->having(array($field, $value, '>='), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingLike($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, 'LIKE'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingLike($field, $value)
+	{
+		return $this->having(array($field, $value, 'LIKE'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingNotLike($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, 'NOT LIKE'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingNotLike($field, $value)
+	{
+		return $this->having(array($field, $value, 'NOT LIKE'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $min
+	 * @param $max
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingBetween($field, $min, $max, $glue = 'AND')
+	{
+		return $this->having(array($field, array($min, $max), 'BETWEEN'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $min
+	 * @param $max
+	 * @return $this
+	 */
+	public function orHavingBetween($field, $min, $max)
+	{
+		return $this->having(array($field, array($min, $max), 'BETWEEN'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $min
+	 * @param $max
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingNotBetween($field, $min, $max, $glue = 'AND')
+	{
+		return $this->having(array($field, array($min, $max), 'NOT BETWEEN'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $min
+	 * @param $max
+	 * @return $this
+	 */
+	public function orHavingNotBetween($field, $min, $max)
+	{
+		return $this->having(array($field, array($min, $max), 'NOT BETWEEN'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingIn($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, 'IN'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingIn($field, $value)
+	{
+		return $this->having(array($field, $value, 'IN'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingNotIn($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, 'NOT IN'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingNotIn($field, $value)
+	{
+		return $this->having(array($field, $value, 'NOT IN'), 'OR');
+	}
+
+	/**
+	 * @param $whereString
+	 * @param array $bindParams
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingExpression($whereString, array $bindParams = [], $glue = 'AND')
+	{
+		$whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
+
+		return $this->having($whereString, $glue);
+	}
+
+	/**
+	 * @param $whereString
+	 * @param array $bindParams
+	 * @return $this
+	 */
+	public function orHavingExpression($whereString, array $bindParams = [])
+	{
+		$whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
+
+		return $this->having($whereString, 'OR');
+	}
+
+	/**
+	 * @return $this
+	 */
+	public function havingInvertResult()
+	{
+		$this->queryStructure->setElement(QueryStructure::HAVING_INVERT, 1);
+
+		return $this;
+	}
+
+	/**
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingGroup($glue = 'AND')
+	{
+		$this->queryStructure->setElement(QueryStructure::HAVING, array('glue' => $glue, 'body' => '(', 'type' => 'start_where_group'));
+
+		return $this;
+	}
+
+	/**
+	 * @return $this
+	 */
+	public function orHavingGroup()
+	{
+		return $this->havingGroup('OR');
+	}
+
+	/**
+	 * @return $this
+	 */
+	public function havingGroupEnd()
+	{
+		$this->queryStructure->setElement(QueryStructure::HAVING, array('glue' => '', 'body' => ')', 'type' => 'end_where_group'));
+
+		return $this;
+	}
+
+	/**
+	 * @param $param
+	 * @param string $glue
+	 * @return $this
+	 */
+	private function having($param, $glue = 'AND')
+	{
+		return $this->createCondition($param, $glue, QueryStructure::HAVING);
+	}
 
 }
\ No newline at end of file

Spacing +61 added lines, -61 removed lines

@@ -22,9 +22,9 @@ 
      * @param $glue
      * @return $this
      */
-    public function havingEqual($field, $value, $glue = 'AND')
+    public function havingEqual( $field, $value, $glue = 'AND' )
     {
-        return $this->having(array($field, $value, '='), $glue);
+        return $this->having( array( $field, $value, '=' ), $glue );
     }
 
     /**
@@ -32,9 +32,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orHavingEqual($field, $value)
+    public function orHavingEqual( $field, $value )
     {
-        return $this->having(array($field, $value, '='), 'OR');
+        return $this->having( array( $field, $value, '=' ), 'OR' );
     }
 
     /**
@@ -43,9 +43,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function havingNotEqual($field, $value, $glue = 'AND')
+    public function havingNotEqual( $field, $value, $glue = 'AND' )
     {
-        return $this->having(array($field, $value, '<>'), $glue);
+        return $this->having( array( $field, $value, '<>' ), $glue );
     }
 
     /**
@@ -53,9 +53,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orHavingNotEqual($field, $value)
+    public function orHavingNotEqual( $field, $value )
     {
-        return $this->having(array($field, $value, '<>'), 'OR');
+        return $this->having( array( $field, $value, '<>' ), 'OR' );
     }
 
     /**
@@ -64,9 +64,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function havingLessThan($field, $value, $glue = 'AND')
+    public function havingLessThan( $field, $value, $glue = 'AND' )
     {
-        return $this->having(array($field, $value, '<'), $glue);
+        return $this->having( array( $field, $value, '<' ), $glue );
     }
 
     /**
@@ -74,9 +74,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orHavingLessThan($field, $value)
+    public function orHavingLessThan( $field, $value )
     {
-        return $this->having(array($field, $value, '<'), 'OR');
+        return $this->having( array( $field, $value, '<' ), 'OR' );
     }
 
     /**
@@ -85,9 +85,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function havingLessThanOrEqual($field, $value, $glue = 'AND')
+    public function havingLessThanOrEqual( $field, $value, $glue = 'AND' )
     {
-        return $this->having(array($field, $value, '<='), $glue);
+        return $this->having( array( $field, $value, '<=' ), $glue );
     }
 
     /**
@@ -95,9 +95,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orHavingLessThanOrEqual($field, $value)
+    public function orHavingLessThanOrEqual( $field, $value )
     {
-        return $this->having(array($field, $value, '<='), 'OR');
+        return $this->having( array( $field, $value, '<=' ), 'OR' );
     }
 
     /**
@@ -106,9 +106,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function havingGreaterThan($field, $value, $glue = 'AND')
+    public function havingGreaterThan( $field, $value, $glue = 'AND' )
     {
-        return $this->having(array($field, $value, '>'), $glue);
+        return $this->having( array( $field, $value, '>' ), $glue );
     }
 
     /**
@@ -116,9 +116,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orHavingGreaterThan($field, $value)
+    public function orHavingGreaterThan( $field, $value )
     {
-        return $this->having(array($field, $value, '>'), 'OR');
+        return $this->having( array( $field, $value, '>' ), 'OR' );
     }
 
     /**
@@ -127,9 +127,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function havingGreaterThanOrEqual($field, $value, $glue = 'AND')
+    public function havingGreaterThanOrEqual( $field, $value, $glue = 'AND' )
     {
-        return $this->having(array($field, $value, '>='), $glue);
+        return $this->having( array( $field, $value, '>=' ), $glue );
     }
 
     /**
@@ -137,9 +137,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orHavingGreaterThanOrEqual($field, $value)
+    public function orHavingGreaterThanOrEqual( $field, $value )
     {
-        return $this->having(array($field, $value, '>='), 'OR');
+        return $this->having( array( $field, $value, '>=' ), 'OR' );
     }
 
     /**
@@ -148,9 +148,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function havingLike($field, $value, $glue = 'AND')
+    public function havingLike( $field, $value, $glue = 'AND' )
     {
-        return $this->having(array($field, $value, 'LIKE'), $glue);
+        return $this->having( array( $field, $value, 'LIKE' ), $glue );
     }
 
     /**
@@ -158,9 +158,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orHavingLike($field, $value)
+    public function orHavingLike( $field, $value )
     {
-        return $this->having(array($field, $value, 'LIKE'), 'OR');
+        return $this->having( array( $field, $value, 'LIKE' ), 'OR' );
     }
 
     /**
@@ -169,9 +169,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function havingNotLike($field, $value, $glue = 'AND')
+    public function havingNotLike( $field, $value, $glue = 'AND' )
     {
-        return $this->having(array($field, $value, 'NOT LIKE'), $glue);
+        return $this->having( array( $field, $value, 'NOT LIKE' ), $glue );
     }
 
     /**
@@ -179,9 +179,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orHavingNotLike($field, $value)
+    public function orHavingNotLike( $field, $value )
     {
-        return $this->having(array($field, $value, 'NOT LIKE'), 'OR');
+        return $this->having( array( $field, $value, 'NOT LIKE' ), 'OR' );
     }
 
     /**
@@ -191,9 +191,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function havingBetween($field, $min, $max, $glue = 'AND')
+    public function havingBetween( $field, $min, $max, $glue = 'AND' )
     {
-        return $this->having(array($field, array($min, $max), 'BETWEEN'), $glue);
+        return $this->having( array( $field, array( $min, $max ), 'BETWEEN' ), $glue );
     }
 
     /**
@@ -202,9 +202,9 @@ 
      * @param $max
      * @return $this
      */
-    public function orHavingBetween($field, $min, $max)
+    public function orHavingBetween( $field, $min, $max )
     {
-        return $this->having(array($field, array($min, $max), 'BETWEEN'), 'OR');
+        return $this->having( array( $field, array( $min, $max ), 'BETWEEN' ), 'OR' );
     }
 
     /**
@@ -214,9 +214,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function havingNotBetween($field, $min, $max, $glue = 'AND')
+    public function havingNotBetween( $field, $min, $max, $glue = 'AND' )
     {
-        return $this->having(array($field, array($min, $max), 'NOT BETWEEN'), $glue);
+        return $this->having( array( $field, array( $min, $max ), 'NOT BETWEEN' ), $glue );
     }
 
     /**
@@ -225,9 +225,9 @@ 
      * @param $max
      * @return $this
      */
-    public function orHavingNotBetween($field, $min, $max)
+    public function orHavingNotBetween( $field, $min, $max )
     {
-        return $this->having(array($field, array($min, $max), 'NOT BETWEEN'), 'OR');
+        return $this->having( array( $field, array( $min, $max ), 'NOT BETWEEN' ), 'OR' );
     }
 
     /**
@@ -236,9 +236,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function havingIn($field, $value, $glue = 'AND')
+    public function havingIn( $field, $value, $glue = 'AND' )
     {
-        return $this->having(array($field, $value, 'IN'), $glue);
+        return $this->having( array( $field, $value, 'IN' ), $glue );
     }
 
     /**
@@ -246,9 +246,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orHavingIn($field, $value)
+    public function orHavingIn( $field, $value )
     {
-        return $this->having(array($field, $value, 'IN'), 'OR');
+        return $this->having( array( $field, $value, 'IN' ), 'OR' );
     }
 
     /**
@@ -257,9 +257,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function havingNotIn($field, $value, $glue = 'AND')
+    public function havingNotIn( $field, $value, $glue = 'AND' )
     {
-        return $this->having(array($field, $value, 'NOT IN'), $glue);
+        return $this->having( array( $field, $value, 'NOT IN' ), $glue );
     }
 
     /**
@@ -267,9 +267,9 @@ 
      * @param $value
      * @return $this
      */
-    public function orHavingNotIn($field, $value)
+    public function orHavingNotIn( $field, $value )
     {
-        return $this->having(array($field, $value, 'NOT IN'), 'OR');
+        return $this->having( array( $field, $value, 'NOT IN' ), 'OR' );
     }
 
     /**
@@ -278,11 +278,11 @@ 
      * @param string $glue
      * @return $this
      */
-    public function havingExpression($whereString, array $bindParams = [], $glue = 'AND')
+    public function havingExpression( $whereString, array $bindParams = [ ], $glue = 'AND' )
     {
-        $whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
+        $whereString = $this->queryStructure->bindParamsExpression( $whereString, $bindParams );
 
-        return $this->having($whereString, $glue);
+        return $this->having( $whereString, $glue );
     }
 
     /**
@@ -290,11 +290,11 @@ 
      * @param array $bindParams
      * @return $this
      */
-    public function orHavingExpression($whereString, array $bindParams = [])
+    public function orHavingExpression( $whereString, array $bindParams = [ ] )
     {
-        $whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
+        $whereString = $this->queryStructure->bindParamsExpression( $whereString, $bindParams );
 
-        return $this->having($whereString, 'OR');
+        return $this->having( $whereString, 'OR' );
     }
 
     /**
@@ -302,7 +302,7 @@ 
      */
     public function havingInvertResult()
     {
-        $this->queryStructure->setElement(QueryStructure::HAVING_INVERT, 1);
+        $this->queryStructure->setElement( QueryStructure::HAVING_INVERT, 1 );
 
         return $this;
     }
@@ -311,9 +311,9 @@ 
      * @param string $glue
      * @return $this
      */
-    public function havingGroup($glue = 'AND')
+    public function havingGroup( $glue = 'AND' )
     {
-        $this->queryStructure->setElement(QueryStructure::HAVING, array('glue' => $glue, 'body' => '(', 'type' => 'start_where_group'));
+        $this->queryStructure->setElement( QueryStructure::HAVING, array( 'glue' => $glue, 'body' => '(', 'type' => 'start_where_group' ) );
 
         return $this;
     }
@@ -323,7 +323,7 @@ 
      */
     public function orHavingGroup()
     {
-        return $this->havingGroup('OR');
+        return $this->havingGroup( 'OR' );
     }
 
     /**
@@ -331,7 +331,7 @@ 
      */
     public function havingGroupEnd()
     {
-        $this->queryStructure->setElement(QueryStructure::HAVING, array('glue' => '', 'body' => ')', 'type' => 'end_where_group'));
+        $this->queryStructure->setElement( QueryStructure::HAVING, array( 'glue' => '', 'body' => ')', 'type' => 'end_where_group' ) );
 
         return $this;
     }
@@ -341,9 +341,9 @@ 
      * @param string $glue
      * @return $this
      */
-    private function having($param, $glue = 'AND')
+    private function having( $param, $glue = 'AND' )
     {
-        return $this->createCondition($param, $glue, QueryStructure::HAVING);
+        return $this->createCondition( $param, $glue, QueryStructure::HAVING );
     }
 
 }
\ No newline at end of file

src/Traits/WhereAndHavingBuilder.php

Indentation +162 added lines, -162 removed lines

@@ -17,167 +17,167 @@
 trait WhereAndHavingBuilder
 {
 
-    use Objects;
-
-
-    /**
-     * @param $param
-     * @param string $glue
-     * @param $clauseType
-     * @return $this
-     */
-    protected function createCondition($param, $glue = 'AND', $clauseType)
-    {
-
-        if (!is_array($param)) {
-            $this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => trim($param), 'type' => 'cond'));
-
-            return $this;
-        }
-
-        $param = $this->validateWhereParam($param);
-
-        $field = $param[0];
-        $value = $param[1];
-        $operator = $param[2];
-
-        switch ($operator) {
-            case 'BETWEEN':
-            case 'NOT BETWEEN':
-            case '!BETWEEN':
-                $min = $value[0];
-                $max = $value[1];
-                $body = [$field, $operator, $this->queryStructure->bindParam('min', $min), 'AND', $this->queryStructure->bindParam('max', $max)];
-                $body = implode(' ', $body);
-                $this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
-                break;
-
-            case 'IN':
-            case 'NOT IN':
-            case '!IN':
-                if (is_a($value, QuerySelect::class))
-                    return $this->inSelectObject($field, $value, $operator, $glue, $clauseType); elseif (is_array($value))
-                    return $this->inArray($field, $value, $operator, $glue, $clauseType);
-                break;
-
-            default:
-                $valuePdoString = $this->queryStructure->bindParam($field, $value);
-                $body = $field . ' ' . $operator . ' ' . $valuePdoString;
-                $this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
-
-        }
-
-        return $this;
-
-    }
-
-
-    /**
-     * @param $field
-     * @param QuerySelect $subquerySelect
-     * @param $operator
-     * @param string $glue
-     * @param $clauseType
-     * @return $this
-     */
-    private function inSelectObject($field, QuerySelect $subquerySelect, $operator, $glue = 'AND', $clauseType)
-    {
-        $subquerySelectParams = $subquerySelect->getBindParams();
-        foreach ($subquerySelectParams as $key => $value) {
-            $this->queryStructure->setParams($key, $value);
-        }
-        $body = [$field, $operator, '( ', $subquerySelect->getSyntax(), ' )'];
-        $body = implode(' ', $body);
-        $this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
-
-        return $this;
-    }
-
-    /**
-     * @param $field
-     * @param array $value
-     * @param $operator
-     * @param $glue
-     * @param $clauseType
-     * @return $this
-     */
-    private function inArray($field, array $value, $operator, $glue, $clauseType)
-    {
-        $pdoArray = array();
-        foreach ($value as $item) {
-            $pdoArray[] = $this->queryStructure->bindParam('a', $item);
-        }
-        $body = [$field, $operator, '( ' . implode(', ', $pdoArray) . ' )'];
-        $body = implode(' ', $body);
-        $body = QueryHelper::clearMultipleSpaces($body);
-        $this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
-
-        return $this;
-    }
-
-
-    /**
-     * @return bool|mixed|string
-     */
-    private function getWhereSyntax()
-    {
-        return $this->getWhereAndHavingSyntax(QueryStructure::WHERE);
-    }
-
-    /**
-     * @return bool|mixed|string
-     */
-    private function getHavingSyntax()
-    {
-        return $this->getWhereAndHavingSyntax(QueryStructure::HAVING);
-    }
-
-    /**
-     * @param $clauseType
-     * @return bool|mixed|string
-     */
-    private function getWhereAndHavingSyntax($clauseType)
-    {
-        if (count($this->queryStructure->getElement($clauseType)) == 0)
-            return '';
-
-        $where = '';
-        $last_type = 'where_start';
-        foreach ($this->queryStructure->getElement($clauseType) as $where_cond) {
-            $glue = $where_cond['glue'];
-            if ($last_type == 'where_start' || $last_type == 'start_where_group') {
-                $glue = '';
-            }
-            $where .= ' ' . $glue . ' ' . $where_cond['body'];
-            $last_type = $where_cond['type'];
-        }
-
-        if ($this->queryStructure->getElement($clauseType . '_invert')) {
-            $where = ' NOT ( ' . $where . ' ) ';
-        }
-
-        $where = 'WHERE ' . $where;
-
-        return QueryHelper::clearMultipleSpaces($where);
-    }
-
-    /**
-     * @param $param
-     * @return array
-     * @throws QueryException
-     */
-    private function validateWhereParam($param)
-    {
-        if (count($param) < 2)
-            throw new QueryException('Invalid where array!', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY);
-
-        if (count($param) == 2)
-            $param[] = '=';
-
-        $param[2] = trim(strtoupper($param[2]));
-        $param[2] = QueryHelper::clearMultipleSpaces($param[2]);
-
-        return $param;
-    }
+	use Objects;
+
+
+	/**
+	 * @param $param
+	 * @param string $glue
+	 * @param $clauseType
+	 * @return $this
+	 */
+	protected function createCondition($param, $glue = 'AND', $clauseType)
+	{
+
+		if (!is_array($param)) {
+			$this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => trim($param), 'type' => 'cond'));
+
+			return $this;
+		}
+
+		$param = $this->validateWhereParam($param);
+
+		$field = $param[0];
+		$value = $param[1];
+		$operator = $param[2];
+
+		switch ($operator) {
+			case 'BETWEEN':
+			case 'NOT BETWEEN':
+			case '!BETWEEN':
+				$min = $value[0];
+				$max = $value[1];
+				$body = [$field, $operator, $this->queryStructure->bindParam('min', $min), 'AND', $this->queryStructure->bindParam('max', $max)];
+				$body = implode(' ', $body);
+				$this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
+				break;
+
+			case 'IN':
+			case 'NOT IN':
+			case '!IN':
+				if (is_a($value, QuerySelect::class))
+					return $this->inSelectObject($field, $value, $operator, $glue, $clauseType); elseif (is_array($value))
+					return $this->inArray($field, $value, $operator, $glue, $clauseType);
+				break;
+
+			default:
+				$valuePdoString = $this->queryStructure->bindParam($field, $value);
+				$body = $field . ' ' . $operator . ' ' . $valuePdoString;
+				$this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
+
+		}
+
+		return $this;
+
+	}
+
+
+	/**
+	 * @param $field
+	 * @param QuerySelect $subquerySelect
+	 * @param $operator
+	 * @param string $glue
+	 * @param $clauseType
+	 * @return $this
+	 */
+	private function inSelectObject($field, QuerySelect $subquerySelect, $operator, $glue = 'AND', $clauseType)
+	{
+		$subquerySelectParams = $subquerySelect->getBindParams();
+		foreach ($subquerySelectParams as $key => $value) {
+			$this->queryStructure->setParams($key, $value);
+		}
+		$body = [$field, $operator, '( ', $subquerySelect->getSyntax(), ' )'];
+		$body = implode(' ', $body);
+		$this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
+
+		return $this;
+	}
+
+	/**
+	 * @param $field
+	 * @param array $value
+	 * @param $operator
+	 * @param $glue
+	 * @param $clauseType
+	 * @return $this
+	 */
+	private function inArray($field, array $value, $operator, $glue, $clauseType)
+	{
+		$pdoArray = array();
+		foreach ($value as $item) {
+			$pdoArray[] = $this->queryStructure->bindParam('a', $item);
+		}
+		$body = [$field, $operator, '( ' . implode(', ', $pdoArray) . ' )'];
+		$body = implode(' ', $body);
+		$body = QueryHelper::clearMultipleSpaces($body);
+		$this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
+
+		return $this;
+	}
+
+
+	/**
+	 * @return bool|mixed|string
+	 */
+	private function getWhereSyntax()
+	{
+		return $this->getWhereAndHavingSyntax(QueryStructure::WHERE);
+	}
+
+	/**
+	 * @return bool|mixed|string
+	 */
+	private function getHavingSyntax()
+	{
+		return $this->getWhereAndHavingSyntax(QueryStructure::HAVING);
+	}
+
+	/**
+	 * @param $clauseType
+	 * @return bool|mixed|string
+	 */
+	private function getWhereAndHavingSyntax($clauseType)
+	{
+		if (count($this->queryStructure->getElement($clauseType)) == 0)
+			return '';
+
+		$where = '';
+		$last_type = 'where_start';
+		foreach ($this->queryStructure->getElement($clauseType) as $where_cond) {
+			$glue = $where_cond['glue'];
+			if ($last_type == 'where_start' || $last_type == 'start_where_group') {
+				$glue = '';
+			}
+			$where .= ' ' . $glue . ' ' . $where_cond['body'];
+			$last_type = $where_cond['type'];
+		}
+
+		if ($this->queryStructure->getElement($clauseType . '_invert')) {
+			$where = ' NOT ( ' . $where . ' ) ';
+		}
+
+		$where = 'WHERE ' . $where;
+
+		return QueryHelper::clearMultipleSpaces($where);
+	}
+
+	/**
+	 * @param $param
+	 * @return array
+	 * @throws QueryException
+	 */
+	private function validateWhereParam($param)
+	{
+		if (count($param) < 2)
+			throw new QueryException('Invalid where array!', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY);
+
+		if (count($param) == 2)
+			$param[] = '=';
+
+		$param[2] = trim(strtoupper($param[2]));
+		$param[2] = QueryHelper::clearMultipleSpaces($param[2]);
+
+		return $param;
+	}
 
 }
\ No newline at end of file

Spacing +49 added lines, -49 removed lines

@@ -26,44 +26,44 @@ 
      * @param $clauseType
      * @return $this
      */
-    protected function createCondition($param, $glue = 'AND', $clauseType)
+    protected function createCondition( $param, $glue = 'AND', $clauseType )
     {
 
-        if (!is_array($param)) {
-            $this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => trim($param), 'type' => 'cond'));
+        if ( !is_array( $param ) ) {
+            $this->queryStructure->setElement( $clauseType, array( 'glue' => $glue, 'body' => trim( $param ), 'type' => 'cond' ) );
 
             return $this;
         }
 
-        $param = $this->validateWhereParam($param);
+        $param = $this->validateWhereParam( $param );
 
-        $field = $param[0];
-        $value = $param[1];
-        $operator = $param[2];
+        $field = $param[ 0 ];
+        $value = $param[ 1 ];
+        $operator = $param[ 2 ];
 
-        switch ($operator) {
+        switch ( $operator ) {
             case 'BETWEEN':
             case 'NOT BETWEEN':
             case '!BETWEEN':
-                $min = $value[0];
-                $max = $value[1];
-                $body = [$field, $operator, $this->queryStructure->bindParam('min', $min), 'AND', $this->queryStructure->bindParam('max', $max)];
-                $body = implode(' ', $body);
-                $this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
+                $min = $value[ 0 ];
+                $max = $value[ 1 ];
+                $body = [ $field, $operator, $this->queryStructure->bindParam( 'min', $min ), 'AND', $this->queryStructure->bindParam( 'max', $max ) ];
+                $body = implode( ' ', $body );
+                $this->queryStructure->setElement( $clauseType, array( 'glue' => $glue, 'body' => $body, 'type' => 'cond' ) );
                 break;
 
             case 'IN':
             case 'NOT IN':
             case '!IN':
-                if (is_a($value, QuerySelect::class))
-                    return $this->inSelectObject($field, $value, $operator, $glue, $clauseType); elseif (is_array($value))
-                    return $this->inArray($field, $value, $operator, $glue, $clauseType);
+                if ( is_a( $value, QuerySelect::class ) )
+                    return $this->inSelectObject( $field, $value, $operator, $glue, $clauseType ); elseif ( is_array( $value ) )
+                    return $this->inArray( $field, $value, $operator, $glue, $clauseType );
                 break;
 
             default:
-                $valuePdoString = $this->queryStructure->bindParam($field, $value);
+                $valuePdoString = $this->queryStructure->bindParam( $field, $value );
                 $body = $field . ' ' . $operator . ' ' . $valuePdoString;
-                $this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
+                $this->queryStructure->setElement( $clauseType, array( 'glue' => $glue, 'body' => $body, 'type' => 'cond' ) );
 
         }
 
@@ -80,15 +80,15 @@ 
      * @param $clauseType
      * @return $this
      */
-    private function inSelectObject($field, QuerySelect $subquerySelect, $operator, $glue = 'AND', $clauseType)
+    private function inSelectObject( $field, QuerySelect $subquerySelect, $operator, $glue = 'AND', $clauseType )
     {
         $subquerySelectParams = $subquerySelect->getBindParams();
-        foreach ($subquerySelectParams as $key => $value) {
-            $this->queryStructure->setParams($key, $value);
+        foreach ( $subquerySelectParams as $key => $value ) {
+            $this->queryStructure->setParams( $key, $value );
         }
-        $body = [$field, $operator, '( ', $subquerySelect->getSyntax(), ' )'];
-        $body = implode(' ', $body);
-        $this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
+        $body = [ $field, $operator, '( ', $subquerySelect->getSyntax(), ' )' ];
+        $body = implode( ' ', $body );
+        $this->queryStructure->setElement( $clauseType, array( 'glue' => $glue, 'body' => $body, 'type' => 'cond' ) );
 
         return $this;
     }
@@ -101,16 +101,16 @@ 
      * @param $clauseType
      * @return $this
      */
-    private function inArray($field, array $value, $operator, $glue, $clauseType)
+    private function inArray( $field, array $value, $operator, $glue, $clauseType )
     {
         $pdoArray = array();
-        foreach ($value as $item) {
-            $pdoArray[] = $this->queryStructure->bindParam('a', $item);
+        foreach ( $value as $item ) {
+            $pdoArray[ ] = $this->queryStructure->bindParam( 'a', $item );
         }
-        $body = [$field, $operator, '( ' . implode(', ', $pdoArray) . ' )'];
-        $body = implode(' ', $body);
-        $body = QueryHelper::clearMultipleSpaces($body);
-        $this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
+        $body = [ $field, $operator, '( ' . implode( ', ', $pdoArray ) . ' )' ];
+        $body = implode( ' ', $body );
+        $body = QueryHelper::clearMultipleSpaces( $body );
+        $this->queryStructure->setElement( $clauseType, array( 'glue' => $glue, 'body' => $body, 'type' => 'cond' ) );
 
         return $this;
     }
@@ -121,7 +121,7 @@ 
      */
     private function getWhereSyntax()
     {
-        return $this->getWhereAndHavingSyntax(QueryStructure::WHERE);
+        return $this->getWhereAndHavingSyntax( QueryStructure::WHERE );
     }
 
     /**
@@ -129,36 +129,36 @@ 
      */
     private function getHavingSyntax()
     {
-        return $this->getWhereAndHavingSyntax(QueryStructure::HAVING);
+        return $this->getWhereAndHavingSyntax( QueryStructure::HAVING );
     }
 
     /**
      * @param $clauseType
      * @return bool|mixed|string
      */
-    private function getWhereAndHavingSyntax($clauseType)
+    private function getWhereAndHavingSyntax( $clauseType )
     {
-        if (count($this->queryStructure->getElement($clauseType)) == 0)
+        if ( count( $this->queryStructure->getElement( $clauseType ) ) == 0 )
             return '';
 
         $where = '';
         $last_type = 'where_start';
-        foreach ($this->queryStructure->getElement($clauseType) as $where_cond) {
-            $glue = $where_cond['glue'];
-            if ($last_type == 'where_start' || $last_type == 'start_where_group') {
+        foreach ( $this->queryStructure->getElement( $clauseType ) as $where_cond ) {
+            $glue = $where_cond[ 'glue' ];
+            if ( $last_type == 'where_start' || $last_type == 'start_where_group' ) {
                 $glue = '';
             }
-            $where .= ' ' . $glue . ' ' . $where_cond['body'];
-            $last_type = $where_cond['type'];
+            $where .= ' ' . $glue . ' ' . $where_cond[ 'body' ];
+            $last_type = $where_cond[ 'type' ];
         }
 
-        if ($this->queryStructure->getElement($clauseType . '_invert')) {
+        if ( $this->queryStructure->getElement( $clauseType . '_invert' ) ) {
             $where = ' NOT ( ' . $where . ' ) ';
         }
 
         $where = 'WHERE ' . $where;
 
-        return QueryHelper::clearMultipleSpaces($where);
+        return QueryHelper::clearMultipleSpaces( $where );
     }
 
     /**
@@ -166,16 +166,16 @@ 
      * @return array
      * @throws QueryException
      */
-    private function validateWhereParam($param)
+    private function validateWhereParam( $param )
     {
-        if (count($param) < 2)
-            throw new QueryException('Invalid where array!', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY);
+        if ( count( $param ) < 2 )
+            throw new QueryException( 'Invalid where array!', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY );
 
-        if (count($param) == 2)
-            $param[] = '=';
+        if ( count( $param ) == 2 )
+            $param[ ] = '=';
 
-        $param[2] = trim(strtoupper($param[2]));
-        $param[2] = QueryHelper::clearMultipleSpaces($param[2]);
+        $param[ 2 ] = trim( strtoupper( $param[ 2 ] ) );
+        $param[ 2 ] = QueryHelper::clearMultipleSpaces( $param[ 2 ] );
 
         return $param;
     }

Braces +14 added lines, -9 removed lines

@@ -55,9 +55,11 @@ 
             case 'IN':
             case 'NOT IN':
             case '!IN':
-                if (is_a($value, QuerySelect::class))
-                    return $this->inSelectObject($field, $value, $operator, $glue, $clauseType); elseif (is_array($value))
-                    return $this->inArray($field, $value, $operator, $glue, $clauseType);
+                if (is_a($value, QuerySelect::class)) {
+                                    return $this->inSelectObject($field, $value, $operator, $glue, $clauseType);
+                } elseif (is_array($value)) {
+                                        return $this->inArray($field, $value, $operator, $glue, $clauseType);
+                    }
                 break;
 
             default:
@@ -138,8 +140,9 @@ 
      */
     private function getWhereAndHavingSyntax($clauseType)
     {
-        if (count($this->queryStructure->getElement($clauseType)) == 0)
-            return '';
+        if (count($this->queryStructure->getElement($clauseType)) == 0) {
+                    return '';
+        }
 
         $where = '';
         $last_type = 'where_start';
@@ -168,11 +171,13 @@ 
      */
     private function validateWhereParam($param)
     {
-        if (count($param) < 2)
-            throw new QueryException('Invalid where array!', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY);
+        if (count($param) < 2) {
+                    throw new QueryException('Invalid where array!', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY);
+        }
 
-        if (count($param) == 2)
-            $param[] = '=';
+        if (count($param) == 2) {
+                    $param[] = '=';
+        }
 
         $param[2] = trim(strtoupper($param[2]));
         $param[2] = QueryHelper::clearMultipleSpaces($param[2]);