adumitru68 / QueryBuilder

src/Traits/SetFields.php

Indentation +42 added lines, -42 removed lines

@@ -13,56 +13,56 @@
 trait SetFields
 {
 
-    use Objects;
+	use Objects;
 
-    private $setValues;
+	private $setValues;
 
-    /**
-     * @param $fieldName
-     * @param $fieldValue
-     * @return $this
-     */
-    public function setField($fieldName, $fieldValue)
-    {
-        $valuePdoString = $this->queryStructure->bindParam($fieldName, $fieldValue);
-        $this->queryStructure->setElement(QueryStructure::SET_FIELDS, "$fieldName = $valuePdoString");
+	/**
+	 * @param $fieldName
+	 * @param $fieldValue
+	 * @return $this
+	 */
+	public function setField($fieldName, $fieldValue)
+	{
+		$valuePdoString = $this->queryStructure->bindParam($fieldName, $fieldValue);
+		$this->queryStructure->setElement(QueryStructure::SET_FIELDS, "$fieldName = $valuePdoString");
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * @param string $expression
-     * @return $this
-     */
-    public function setFieldByExpression($expression)
-    {
-        $this->queryStructure->setElement(QueryStructure::SET_FIELDS, $expression);
+	/**
+	 * @param string $expression
+	 * @return $this
+	 */
+	public function setFieldByExpression($expression)
+	{
+		$this->queryStructure->setElement(QueryStructure::SET_FIELDS, $expression);
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * Set fields by associative array ( fieldName => fieldValue )
-     * @param array $updateFieldsArray
-     * @return $this
-     */
-    public function setFieldsByArray(array $updateFieldsArray)
-    {
-        foreach ($updateFieldsArray as $fieldName => $fieldValue)
-            $this->setField($fieldName, $fieldValue);
+	/**
+	 * Set fields by associative array ( fieldName => fieldValue )
+	 * @param array $updateFieldsArray
+	 * @return $this
+	 */
+	public function setFieldsByArray(array $updateFieldsArray)
+	{
+		foreach ($updateFieldsArray as $fieldName => $fieldValue)
+			$this->setField($fieldName, $fieldValue);
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * @return string
-     */
-    private function getSettingFieldsSyntax()
-    {
-        if (!count($this->queryStructure->getElement(QueryStructure::SET_FIELDS)))
-            return '';
+	/**
+	 * @return string
+	 */
+	private function getSettingFieldsSyntax()
+	{
+		if (!count($this->queryStructure->getElement(QueryStructure::SET_FIELDS)))
+			return '';
 
-        return 'SET ' . implode(', ', $this->queryStructure->getElement(QueryStructure::SET_FIELDS));
-    }
+		return 'SET ' . implode(', ', $this->queryStructure->getElement(QueryStructure::SET_FIELDS));
+	}
 
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -22,10 +22,10 @@ 
      * @param $fieldValue
      * @return $this
      */
-    public function setField($fieldName, $fieldValue)
+    public function setField( $fieldName, $fieldValue )
     {
-        $valuePdoString = $this->queryStructure->bindParam($fieldName, $fieldValue);
-        $this->queryStructure->setElement(QueryStructure::SET_FIELDS, "$fieldName = $valuePdoString");
+        $valuePdoString = $this->queryStructure->bindParam( $fieldName, $fieldValue );
+        $this->queryStructure->setElement( QueryStructure::SET_FIELDS, "$fieldName = $valuePdoString" );
 
         return $this;
     }
@@ -34,9 +34,9 @@ 
      * @param string $expression
      * @return $this
      */
-    public function setFieldByExpression($expression)
+    public function setFieldByExpression( $expression )
     {
-        $this->queryStructure->setElement(QueryStructure::SET_FIELDS, $expression);
+        $this->queryStructure->setElement( QueryStructure::SET_FIELDS, $expression );
 
         return $this;
     }
@@ -46,10 +46,10 @@ 
      * @param array $updateFieldsArray
      * @return $this
      */
-    public function setFieldsByArray(array $updateFieldsArray)
+    public function setFieldsByArray( array $updateFieldsArray )
     {
-        foreach ($updateFieldsArray as $fieldName => $fieldValue)
-            $this->setField($fieldName, $fieldValue);
+        foreach ( $updateFieldsArray as $fieldName => $fieldValue )
+            $this->setField( $fieldName, $fieldValue );
 
         return $this;
     }
@@ -59,10 +59,10 @@ 
      */
     private function getSettingFieldsSyntax()
     {
-        if (!count($this->queryStructure->getElement(QueryStructure::SET_FIELDS)))
+        if ( !count( $this->queryStructure->getElement( QueryStructure::SET_FIELDS ) ) )
             return '';
 
-        return 'SET ' . implode(', ', $this->queryStructure->getElement(QueryStructure::SET_FIELDS));
+        return 'SET ' . implode( ', ', $this->queryStructure->getElement( QueryStructure::SET_FIELDS ) );
     }
 
 }
\ No newline at end of file

Braces +6 added lines, -4 removed lines

@@ -48,8 +48,9 @@ 
      */
     public function setFieldsByArray(array $updateFieldsArray)
     {
-        foreach ($updateFieldsArray as $fieldName => $fieldValue)
-            $this->setField($fieldName, $fieldValue);
+        foreach ($updateFieldsArray as $fieldName => $fieldValue) {
+                    $this->setField($fieldName, $fieldValue);
+        }
 
         return $this;
     }
@@ -59,8 +60,9 @@ 
      */
     private function getSettingFieldsSyntax()
     {
-        if (!count($this->queryStructure->getElement(QueryStructure::SET_FIELDS)))
-            return '';
+        if (!count($this->queryStructure->getElement(QueryStructure::SET_FIELDS))) {
+                    return '';
+        }
 
         return 'SET ' . implode(', ', $this->queryStructure->getElement(QueryStructure::SET_FIELDS));
     }

src/Traits/Join.php

Indentation +120 added lines, -120 removed lines

@@ -14,125 +14,125 @@
 trait Join
 {
 
-    use Objects;
-
-
-    /**
-     * @param $tableJoin
-     * @param $onLeft
-     * @param null $onRight
-     * @return $this
-     */
-    public function innerJoin($tableJoin, $onLeft, $onRight = null)
-    {
-        return $this->makeJoin('INNER JOIN', $tableJoin, $onLeft, $onRight);
-    }
-
-    /**
-     * @param $tableJoin
-     * @param $onLeft
-     * @param null $onRight
-     * @return $this
-     */
-    public function leftJoin($tableJoin, $onLeft, $onRight = null)
-    {
-        return $this->makeJoin('LEFT JOIN', $tableJoin, $onLeft, $onRight);
-    }
-
-    /**
-     * @param $tableJoin
-     * @param $onLeft
-     * @param null $onRight
-     * @return $this
-     */
-    public function leftOuterJoin($tableJoin, $onLeft, $onRight = null)
-    {
-        return $this->makeJoin('LEFT OUTER JOIN', $tableJoin, $onLeft, $onRight);
-    }
-
-    /**
-     * @param $tableJoin
-     * @param $onLeft
-     * @param null $onRight
-     * @return $this
-     */
-    public function rightJoin($tableJoin, $onLeft, $onRight = null)
-    {
-        return $this->makeJoin('RIGHT JOIN', $tableJoin, $onLeft, $onRight);
-    }
-
-    /**
-     * @param $tableJoin
-     * @param $onLeft
-     * @param null $onRight
-     * @return $this
-     */
-    public function rightOuterJoin($tableJoin, $onLeft, $onRight = null)
-    {
-        return $this->makeJoin('RIGHT OUTER JOIN', $tableJoin, $onLeft, $onRight);
-    }
-
-    /**
-     * @param $tableJoin
-     * @param $onLeft
-     * @param null $onRight
-     * @return $this
-     */
-    public function fullJoin($tableJoin, $onLeft, $onRight = null)
-    {
-        return $this->makeJoin('FULL JOIN', $tableJoin, $onLeft, $onRight);
-    }
-
-    /**
-     * @param $tableJoin
-     * @param $onLeft
-     * @param null $onRight
-     * @return $this
-     */
-    public function fullOuterJoin($tableJoin, $onLeft, $onRight = null)
-    {
-        return $this->makeJoin('FULL OUTER JOIN', $tableJoin, $onLeft, $onRight);
-    }
-
-    /**
-     * @param $stringJoin
-     * @return $this
-     */
-    public function join($stringJoin)
-    {
-        $this->queryStructure->setElement(QueryStructure::JOIN, $stringJoin);
-
-        return $this;
-    }
-
-    /**
-     * @param $typeJoin
-     * @param $tableJoin
-     * @param $onLeft
-     * @param null $onRight
-     * @return $this
-     */
-    private function makeJoin($typeJoin, $tableJoin, $onLeft, $onRight = null)
-    {
-        $join = $typeJoin . ' ' . $tableJoin;
-
-        if (is_null($onRight))
-            $join .= " USING ( $onLeft )"; else
-            $join .= " ON $onLeft = $onRight";
-
-        $this->queryStructure->setElement(QueryStructure::JOIN, $join);
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    private function getJoinSyntax()
-    {
-        $joinString = implode(' ', $this->queryStructure->getElement(QueryStructure::JOIN));
-
-        return QueryHelper::clearMultipleSpaces($joinString);
-    }
+	use Objects;
+
+
+	/**
+	 * @param $tableJoin
+	 * @param $onLeft
+	 * @param null $onRight
+	 * @return $this
+	 */
+	public function innerJoin($tableJoin, $onLeft, $onRight = null)
+	{
+		return $this->makeJoin('INNER JOIN', $tableJoin, $onLeft, $onRight);
+	}
+
+	/**
+	 * @param $tableJoin
+	 * @param $onLeft
+	 * @param null $onRight
+	 * @return $this
+	 */
+	public function leftJoin($tableJoin, $onLeft, $onRight = null)
+	{
+		return $this->makeJoin('LEFT JOIN', $tableJoin, $onLeft, $onRight);
+	}
+
+	/**
+	 * @param $tableJoin
+	 * @param $onLeft
+	 * @param null $onRight
+	 * @return $this
+	 */
+	public function leftOuterJoin($tableJoin, $onLeft, $onRight = null)
+	{
+		return $this->makeJoin('LEFT OUTER JOIN', $tableJoin, $onLeft, $onRight);
+	}
+
+	/**
+	 * @param $tableJoin
+	 * @param $onLeft
+	 * @param null $onRight
+	 * @return $this
+	 */
+	public function rightJoin($tableJoin, $onLeft, $onRight = null)
+	{
+		return $this->makeJoin('RIGHT JOIN', $tableJoin, $onLeft, $onRight);
+	}
+
+	/**
+	 * @param $tableJoin
+	 * @param $onLeft
+	 * @param null $onRight
+	 * @return $this
+	 */
+	public function rightOuterJoin($tableJoin, $onLeft, $onRight = null)
+	{
+		return $this->makeJoin('RIGHT OUTER JOIN', $tableJoin, $onLeft, $onRight);
+	}
+
+	/**
+	 * @param $tableJoin
+	 * @param $onLeft
+	 * @param null $onRight
+	 * @return $this
+	 */
+	public function fullJoin($tableJoin, $onLeft, $onRight = null)
+	{
+		return $this->makeJoin('FULL JOIN', $tableJoin, $onLeft, $onRight);
+	}
+
+	/**
+	 * @param $tableJoin
+	 * @param $onLeft
+	 * @param null $onRight
+	 * @return $this
+	 */
+	public function fullOuterJoin($tableJoin, $onLeft, $onRight = null)
+	{
+		return $this->makeJoin('FULL OUTER JOIN', $tableJoin, $onLeft, $onRight);
+	}
+
+	/**
+	 * @param $stringJoin
+	 * @return $this
+	 */
+	public function join($stringJoin)
+	{
+		$this->queryStructure->setElement(QueryStructure::JOIN, $stringJoin);
+
+		return $this;
+	}
+
+	/**
+	 * @param $typeJoin
+	 * @param $tableJoin
+	 * @param $onLeft
+	 * @param null $onRight
+	 * @return $this
+	 */
+	private function makeJoin($typeJoin, $tableJoin, $onLeft, $onRight = null)
+	{
+		$join = $typeJoin . ' ' . $tableJoin;
+
+		if (is_null($onRight))
+			$join .= " USING ( $onLeft )"; else
+			$join .= " ON $onLeft = $onRight";
+
+		$this->queryStructure->setElement(QueryStructure::JOIN, $join);
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	private function getJoinSyntax()
+	{
+		$joinString = implode(' ', $this->queryStructure->getElement(QueryStructure::JOIN));
+
+		return QueryHelper::clearMultipleSpaces($joinString);
+	}
 
 }
\ No newline at end of file

Spacing +21 added lines, -21 removed lines

@@ -23,9 +23,9 @@ 
      * @param null $onRight
      * @return $this
      */
-    public function innerJoin($tableJoin, $onLeft, $onRight = null)
+    public function innerJoin( $tableJoin, $onLeft, $onRight = null )
     {
-        return $this->makeJoin('INNER JOIN', $tableJoin, $onLeft, $onRight);
+        return $this->makeJoin( 'INNER JOIN', $tableJoin, $onLeft, $onRight );
     }
 
     /**
@@ -34,9 +34,9 @@ 
      * @param null $onRight
      * @return $this
      */
-    public function leftJoin($tableJoin, $onLeft, $onRight = null)
+    public function leftJoin( $tableJoin, $onLeft, $onRight = null )
     {
-        return $this->makeJoin('LEFT JOIN', $tableJoin, $onLeft, $onRight);
+        return $this->makeJoin( 'LEFT JOIN', $tableJoin, $onLeft, $onRight );
     }
 
     /**
@@ -45,9 +45,9 @@ 
      * @param null $onRight
      * @return $this
      */
-    public function leftOuterJoin($tableJoin, $onLeft, $onRight = null)
+    public function leftOuterJoin( $tableJoin, $onLeft, $onRight = null )
     {
-        return $this->makeJoin('LEFT OUTER JOIN', $tableJoin, $onLeft, $onRight);
+        return $this->makeJoin( 'LEFT OUTER JOIN', $tableJoin, $onLeft, $onRight );
     }
 
     /**
@@ -56,9 +56,9 @@ 
      * @param null $onRight
      * @return $this
      */
-    public function rightJoin($tableJoin, $onLeft, $onRight = null)
+    public function rightJoin( $tableJoin, $onLeft, $onRight = null )
     {
-        return $this->makeJoin('RIGHT JOIN', $tableJoin, $onLeft, $onRight);
+        return $this->makeJoin( 'RIGHT JOIN', $tableJoin, $onLeft, $onRight );
     }
 
     /**
@@ -67,9 +67,9 @@ 
      * @param null $onRight
      * @return $this
      */
-    public function rightOuterJoin($tableJoin, $onLeft, $onRight = null)
+    public function rightOuterJoin( $tableJoin, $onLeft, $onRight = null )
     {
-        return $this->makeJoin('RIGHT OUTER JOIN', $tableJoin, $onLeft, $onRight);
+        return $this->makeJoin( 'RIGHT OUTER JOIN', $tableJoin, $onLeft, $onRight );
     }
 
     /**
@@ -78,9 +78,9 @@ 
      * @param null $onRight
      * @return $this
      */
-    public function fullJoin($tableJoin, $onLeft, $onRight = null)
+    public function fullJoin( $tableJoin, $onLeft, $onRight = null )
     {
-        return $this->makeJoin('FULL JOIN', $tableJoin, $onLeft, $onRight);
+        return $this->makeJoin( 'FULL JOIN', $tableJoin, $onLeft, $onRight );
     }
 
     /**
@@ -89,18 +89,18 @@ 
      * @param null $onRight
      * @return $this
      */
-    public function fullOuterJoin($tableJoin, $onLeft, $onRight = null)
+    public function fullOuterJoin( $tableJoin, $onLeft, $onRight = null )
     {
-        return $this->makeJoin('FULL OUTER JOIN', $tableJoin, $onLeft, $onRight);
+        return $this->makeJoin( 'FULL OUTER JOIN', $tableJoin, $onLeft, $onRight );
     }
 
     /**
      * @param $stringJoin
      * @return $this
      */
-    public function join($stringJoin)
+    public function join( $stringJoin )
     {
-        $this->queryStructure->setElement(QueryStructure::JOIN, $stringJoin);
+        $this->queryStructure->setElement( QueryStructure::JOIN, $stringJoin );
 
         return $this;
     }
@@ -112,15 +112,15 @@ 
      * @param null $onRight
      * @return $this
      */
-    private function makeJoin($typeJoin, $tableJoin, $onLeft, $onRight = null)
+    private function makeJoin( $typeJoin, $tableJoin, $onLeft, $onRight = null )
     {
         $join = $typeJoin . ' ' . $tableJoin;
 
-        if (is_null($onRight))
+        if ( is_null( $onRight ) )
             $join .= " USING ( $onLeft )"; else
             $join .= " ON $onLeft = $onRight";
 
-        $this->queryStructure->setElement(QueryStructure::JOIN, $join);
+        $this->queryStructure->setElement( QueryStructure::JOIN, $join );
 
         return $this;
     }
@@ -130,9 +130,9 @@ 
      */
     private function getJoinSyntax()
     {
-        $joinString = implode(' ', $this->queryStructure->getElement(QueryStructure::JOIN));
+        $joinString = implode( ' ', $this->queryStructure->getElement( QueryStructure::JOIN ) );
 
-        return QueryHelper::clearMultipleSpaces($joinString);
+        return QueryHelper::clearMultipleSpaces( $joinString );
     }
 
 }
\ No newline at end of file

Braces +5 added lines, -3 removed lines

@@ -116,9 +116,11 @@
     {
         $join = $typeJoin . ' ' . $tableJoin;
 
-        if (is_null($onRight))
-            $join .= " USING ( $onLeft )"; else
-            $join .= " ON $onLeft = $onRight";
+        if (is_null($onRight)) {
+                    $join .= " USING ( $onLeft )";
+        } else {
+                        $join .= " ON $onLeft = $onRight";
+            }
 
         $this->queryStructure->setElement(QueryStructure::JOIN, $join);
 

src/Traits/TableValidation.php

Indentation +46 added lines, -46 removed lines

@@ -18,52 +18,52 @@
 trait TableValidation
 {
 
-    private function validateTable($table)
-    {
-        switch (gettype($table)) {
-
-            case QueryStructure::ELEMENT_TYPE_STRING:
-                $table = $this->validateTableName($table);
-                break;
-            case QueryStructure::ELEMENT_TYPE_OBJECT:
-                $table = $this->validateTableSubQuery($table);
-                break;
-            default:
-                throw new QueryException('Invalid table type parameter: ' . gettype($table), QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
-
-        }
-
-        return $table;
-    }
-
-    /**
-     * @param $table
-     * @return mixed|string
-     * @throws QueryException
-     */
-    private function validateTableName($table)
-    {
-        $table = trim($table);
-
-        if ('' === $table)
-            throw new QueryException('Table name is empty string!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
-
-        if (DbConfig::getInstance()->useTablePrefix())
-            $table = str_ireplace('::', DbConfig::getInstance()->getTablePrefix(), $table);
-
-        return $table;
-    }
-
-    private function validateTableSubQuery($table)
-    {
-        if ($this->statement !== QueryStatement::QUERY_STATEMENT_SELECT)
-            throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
-
-        if (!is_a($table, QuerySelect::class))
-            throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
-
-        return $table;
-    }
+	private function validateTable($table)
+	{
+		switch (gettype($table)) {
+
+			case QueryStructure::ELEMENT_TYPE_STRING:
+				$table = $this->validateTableName($table);
+				break;
+			case QueryStructure::ELEMENT_TYPE_OBJECT:
+				$table = $this->validateTableSubQuery($table);
+				break;
+			default:
+				throw new QueryException('Invalid table type parameter: ' . gettype($table), QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+
+		}
+
+		return $table;
+	}
+
+	/**
+	 * @param $table
+	 * @return mixed|string
+	 * @throws QueryException
+	 */
+	private function validateTableName($table)
+	{
+		$table = trim($table);
+
+		if ('' === $table)
+			throw new QueryException('Table name is empty string!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+
+		if (DbConfig::getInstance()->useTablePrefix())
+			$table = str_ireplace('::', DbConfig::getInstance()->getTablePrefix(), $table);
+
+		return $table;
+	}
+
+	private function validateTableSubQuery($table)
+	{
+		if ($this->statement !== QueryStatement::QUERY_STATEMENT_SELECT)
+			throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+
+		if (!is_a($table, QuerySelect::class))
+			throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+
+		return $table;
+	}
 
 
 }
\ No newline at end of file

Spacing +16 added lines, -16 removed lines

@@ -18,18 +18,18 @@ 
 trait TableValidation
 {
 
-    private function validateTable($table)
+    private function validateTable( $table )
     {
-        switch (gettype($table)) {
+        switch ( gettype( $table ) ) {
 
             case QueryStructure::ELEMENT_TYPE_STRING:
-                $table = $this->validateTableName($table);
+                $table = $this->validateTableName( $table );
                 break;
             case QueryStructure::ELEMENT_TYPE_OBJECT:
-                $table = $this->validateTableSubQuery($table);
+                $table = $this->validateTableSubQuery( $table );
                 break;
             default:
-                throw new QueryException('Invalid table type parameter: ' . gettype($table), QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+                throw new QueryException( 'Invalid table type parameter: ' . gettype( $table ), QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT );
 
         }
 
@@ -41,26 +41,26 @@ 
      * @return mixed|string
      * @throws QueryException
      */
-    private function validateTableName($table)
+    private function validateTableName( $table )
     {
-        $table = trim($table);
+        $table = trim( $table );
 
-        if ('' === $table)
-            throw new QueryException('Table name is empty string!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        if ( '' === $table )
+            throw new QueryException( 'Table name is empty string!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT );
 
-        if (DbConfig::getInstance()->useTablePrefix())
-            $table = str_ireplace('::', DbConfig::getInstance()->getTablePrefix(), $table);
+        if ( DbConfig::getInstance()->useTablePrefix() )
+            $table = str_ireplace( '::', DbConfig::getInstance()->getTablePrefix(), $table );
 
         return $table;
     }
 
-    private function validateTableSubQuery($table)
+    private function validateTableSubQuery( $table )
     {
-        if ($this->statement !== QueryStatement::QUERY_STATEMENT_SELECT)
-            throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        if ( $this->statement !== QueryStatement::QUERY_STATEMENT_SELECT )
+            throw new QueryException( 'Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT );
 
-        if (!is_a($table, QuerySelect::class))
-            throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        if ( !is_a( $table, QuerySelect::class ) )
+            throw new QueryException( 'Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT );
 
         return $table;
     }

Braces +12 added lines, -8 removed lines

@@ -45,22 +45,26 @@
     {
         $table = trim($table);
 
-        if ('' === $table)
-            throw new QueryException('Table name is empty string!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        if ('' === $table) {
+                    throw new QueryException('Table name is empty string!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        }
 
-        if (DbConfig::getInstance()->useTablePrefix())
-            $table = str_ireplace('::', DbConfig::getInstance()->getTablePrefix(), $table);
+        if (DbConfig::getInstance()->useTablePrefix()) {
+                    $table = str_ireplace('::', DbConfig::getInstance()->getTablePrefix(), $table);
+        }
 
         return $table;
     }
 
     private function validateTableSubQuery($table)
     {
-        if ($this->statement !== QueryStatement::QUERY_STATEMENT_SELECT)
-            throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        if ($this->statement !== QueryStatement::QUERY_STATEMENT_SELECT) {
+                    throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        }
 
-        if (!is_a($table, QuerySelect::class))
-            throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        if (!is_a($table, QuerySelect::class)) {
+                    throw new QueryException('Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT);
+        }
 
         return $table;
     }

src/Traits/Limit.php

Indentation +30 added lines, -30 removed lines

@@ -15,48 +15,48 @@
 trait Limit
 {
 
-    use Objects;
+	use Objects;
 
 
-    /**
-     * @param int $limit
-     * @param null $offset
-     * @return $this
-     * @throws QueryException
-     */
-    public function limit($limit = 0, $offset = null)
-    {
-        $limit = trim($limit);
+	/**
+	 * @param int $limit
+	 * @param null $offset
+	 * @return $this
+	 * @throws QueryException
+	 */
+	public function limit($limit = 0, $offset = null)
+	{
+		$limit = trim($limit);
 
-        if (!QueryHelper::isInteger($limit))
-            throw new QueryException('Invalid Limit value', QueryException::QUERY_ERROR_INVALID_LIMIT);
+		if (!QueryHelper::isInteger($limit))
+			throw new QueryException('Invalid Limit value', QueryException::QUERY_ERROR_INVALID_LIMIT);
 
-        if ($limit == 0)
-            throw new QueryException('Invalid Limit zero', QueryException::QUERY_ERROR_INVALID_LIMIT_ZERO);
+		if ($limit == 0)
+			throw new QueryException('Invalid Limit zero', QueryException::QUERY_ERROR_INVALID_LIMIT_ZERO);
 
-        if (is_null($offset)) {
-            $this->queryStructure->setElement(QueryStructure::LIMIT, $limit);
+		if (is_null($offset)) {
+			$this->queryStructure->setElement(QueryStructure::LIMIT, $limit);
 
-            return $this;
-        }
+			return $this;
+		}
 
-        $offset = trim($offset);
+		$offset = trim($offset);
 
-        if (!QueryHelper::isInteger($offset))
-            throw new QueryException('Invalid Limit offset', QueryException::QUERY_ERROR_INVALID_LIMIT_OFFSET);
+		if (!QueryHelper::isInteger($offset))
+			throw new QueryException('Invalid Limit offset', QueryException::QUERY_ERROR_INVALID_LIMIT_OFFSET);
 
-        $this->queryStructure->setElement(QueryStructure::LIMIT, $offset . ',' . $limit);
+		$this->queryStructure->setElement(QueryStructure::LIMIT, $offset . ',' . $limit);
 
-        return $this;
-    }
+		return $this;
+	}
 
-    private function getLimitSyntax()
-    {
-        if (!$this->queryStructure->getElement(QueryStructure::LIMIT))
-            return '';
+	private function getLimitSyntax()
+	{
+		if (!$this->queryStructure->getElement(QueryStructure::LIMIT))
+			return '';
 
-        return 'LIMIT ' . $this->queryStructure->getElement(QueryStructure::LIMIT);
-    }
+		return 'LIMIT ' . $this->queryStructure->getElement(QueryStructure::LIMIT);
+	}
 
 }
 

Spacing +14 added lines, -14 removed lines

@@ -24,38 +24,38 @@
      * @return $this
      * @throws QueryException
      */
-    public function limit($limit = 0, $offset = null)
+    public function limit( $limit = 0, $offset = null )
     {
-        $limit = trim($limit);
+        $limit = trim( $limit );
 
-        if (!QueryHelper::isInteger($limit))
-            throw new QueryException('Invalid Limit value', QueryException::QUERY_ERROR_INVALID_LIMIT);
+        if ( !QueryHelper::isInteger( $limit ) )
+            throw new QueryException( 'Invalid Limit value', QueryException::QUERY_ERROR_INVALID_LIMIT );
 
-        if ($limit == 0)
-            throw new QueryException('Invalid Limit zero', QueryException::QUERY_ERROR_INVALID_LIMIT_ZERO);
+        if ( $limit == 0 )
+            throw new QueryException( 'Invalid Limit zero', QueryException::QUERY_ERROR_INVALID_LIMIT_ZERO );
 
-        if (is_null($offset)) {
-            $this->queryStructure->setElement(QueryStructure::LIMIT, $limit);
+        if ( is_null( $offset ) ) {
+            $this->queryStructure->setElement( QueryStructure::LIMIT, $limit );
 
             return $this;
         }
 
-        $offset = trim($offset);
+        $offset = trim( $offset );
 
-        if (!QueryHelper::isInteger($offset))
-            throw new QueryException('Invalid Limit offset', QueryException::QUERY_ERROR_INVALID_LIMIT_OFFSET);
+        if ( !QueryHelper::isInteger( $offset ) )
+            throw new QueryException( 'Invalid Limit offset', QueryException::QUERY_ERROR_INVALID_LIMIT_OFFSET );
 
-        $this->queryStructure->setElement(QueryStructure::LIMIT, $offset . ',' . $limit);
+        $this->queryStructure->setElement( QueryStructure::LIMIT, $offset . ',' . $limit );
 
         return $this;
     }
 
     private function getLimitSyntax()
     {
-        if (!$this->queryStructure->getElement(QueryStructure::LIMIT))
+        if ( !$this->queryStructure->getElement( QueryStructure::LIMIT ) )
             return '';
 
-        return 'LIMIT ' . $this->queryStructure->getElement(QueryStructure::LIMIT);
+        return 'LIMIT ' . $this->queryStructure->getElement( QueryStructure::LIMIT );
     }
 
 }

Braces +12 added lines, -8 removed lines

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

src/Traits/ColumnValidation.php

Indentation +9 added lines, -9 removed lines

@@ -12,18 +12,18 @@
 trait ColumnValidation
 {
 
-    use Objects;
+	use Objects;
 
-    protected function validateColumn($columnName, array $allowed)
-    {
-        if (is_integer($columnName))
-            return true;
+	protected function validateColumn($columnName, array $allowed)
+	{
+		if (is_integer($columnName))
+			return true;
 
-        if (!count($allowed))
-            return true;
+		if (!count($allowed))
+			return true;
 
-        return false;
-    }
+		return false;
+	}
 
 
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -14,12 +14,12 @@
 
     use Objects;
 
-    protected function validateColumn($columnName, array $allowed)
+    protected function validateColumn( $columnName, array $allowed )
     {
-        if (is_integer($columnName))
+        if ( is_integer( $columnName ) )
             return true;
 
-        if (!count($allowed))
+        if ( !count( $allowed ) )
             return true;
 
         return false;

Braces +6 added lines, -4 removed lines

@@ -16,11 +16,13 @@
 
     protected function validateColumn($columnName, array $allowed)
     {
-        if (is_integer($columnName))
-            return true;
+        if (is_integer($columnName)) {
+                    return true;
+        }
 
-        if (!count($allowed))
-            return true;
+        if (!count($allowed)) {
+                    return true;
+        }
 
         return false;
     }

src/Traits/Ignore.php

Indentation +9 added lines, -9 removed lines

@@ -14,17 +14,17 @@
 trait Ignore
 {
 
-    use Objects;
+	use Objects;
 
-    /**
-     * @return $this
-     */
-    public function ignore()
-    {
-        $this->queryStructure->setElement(QueryStructure::IGNORE, 1);
+	/**
+	 * @return $this
+	 */
+	public function ignore()
+	{
+		$this->queryStructure->setElement(QueryStructure::IGNORE, 1);
 
-        return $this;
-    }
+		return $this;
+	}
 
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
      */
     public function ignore()
     {
-        $this->queryStructure->setElement(QueryStructure::IGNORE, 1);
+        $this->queryStructure->setElement( QueryStructure::IGNORE, 1 );
 
         return $this;
     }

src/Traits/HighPriority.php

Indentation +9 added lines, -9 removed lines

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

Spacing +1 added lines, -1 removed lines

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

src/Traits/DefaultPriority.php

Indentation +9 added lines, -9 removed lines

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

Spacing +1 added lines, -1 removed lines

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

src/Dependencies/QueryException.php

Indentation +17 added lines, -17 removed lines

@@ -11,23 +11,23 @@
 class QueryException extends \Exception
 {
 
-    const QUERY_ERROR_ELEMENT_NOT_FOUND = 10;
-    const QUERY_ERROR_ELEMENT_TYPE = 11;
-    const QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY = 20;
-    const QUERY_ERROR_WHERE_INVALID_OPERATOR = 30;
-    const QUERY_ERROR_INVALID_LIMIT = 40;
-    const QUERY_ERROR_INVALID_LIMIT_ZERO = 50;
-    const QUERY_ERROR_INVALID_LIMIT_OFFSET = 60;
-    const QUERY_ERROR_DELETE_NOT_FILTER = 70;
+	const QUERY_ERROR_ELEMENT_NOT_FOUND = 10;
+	const QUERY_ERROR_ELEMENT_TYPE = 11;
+	const QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY = 20;
+	const QUERY_ERROR_WHERE_INVALID_OPERATOR = 30;
+	const QUERY_ERROR_INVALID_LIMIT = 40;
+	const QUERY_ERROR_INVALID_LIMIT_ZERO = 50;
+	const QUERY_ERROR_INVALID_LIMIT_OFFSET = 60;
+	const QUERY_ERROR_DELETE_NOT_FILTER = 70;
 
-    const QUERY_ERROR_INVALID_FIELDS_COUNT = 91;
-    const QUERY_ERROR_INVALID_DISTINCT = 92;
-    const QUERY_ERROR_HAVING_INVALID_PARAM_ARRAY = 93;
-    const QUERY_ERROR_HAVING_INVALID_OPERATOR = 94;
-    const QUERY_ERROR_SELECT_INVALID_FIELD = 95;
-    const QUERY_ERROR_SELECT_INVALID_PARAM = 96;
-    const QUERY_ERROR_INVALID_TABLE_STATEMENT = 97;
-    const QUERY_ERROR_INVALID_COLUMN_NAME = 98;
-    const QUERY_ERROR_INVALID_CONDITION_TYPE = 99;
+	const QUERY_ERROR_INVALID_FIELDS_COUNT = 91;
+	const QUERY_ERROR_INVALID_DISTINCT = 92;
+	const QUERY_ERROR_HAVING_INVALID_PARAM_ARRAY = 93;
+	const QUERY_ERROR_HAVING_INVALID_OPERATOR = 94;
+	const QUERY_ERROR_SELECT_INVALID_FIELD = 95;
+	const QUERY_ERROR_SELECT_INVALID_PARAM = 96;
+	const QUERY_ERROR_INVALID_TABLE_STATEMENT = 97;
+	const QUERY_ERROR_INVALID_COLUMN_NAME = 98;
+	const QUERY_ERROR_INVALID_CONDITION_TYPE = 99;
 
 }
\ No newline at end of file