adumitru68 / QueryBuilder

sample/autoloader.php

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

src/Traits/DefaultPriority.php

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

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,16 +112,16 @@ 
 	 * @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;
 	}
@@ -131,9 +131,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, -4 removed lines

@@ -116,10 +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/Limit.php

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

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
 
 	protected function getExplainSyntax()
 	{
-		if($this->queryStructure->getElement(QueryStructure::EXPLAIN))
+		if ($this->queryStructure->getElement(QueryStructure::EXPLAIN))
 			return 'EXPLAIN';
 
 		return '';
@@ -39,9 +39,9 @@ 
 	 * @param string $comment
 	 * @return $this
 	 */
-	public function withComment( $comment = '' )
+	public function withComment($comment = '')
 	{
-		$this->queryStructure->setElement( QueryStructure::QUERY_COMMENT, $comment );
+		$this->queryStructure->setElement(QueryStructure::QUERY_COMMENT, $comment);
 
 		return $this;
 	}
@@ -50,9 +50,9 @@ 
 	 * @param string $identifier
 	 * @return $this
 	 */
-	public function withLogIdentifier( $identifier = null )
+	public function withLogIdentifier($identifier = null)
 	{
-		$this->queryStructure->setElement( QueryStructure::QUERY_IDENTIFIER, $identifier );
+		$this->queryStructure->setElement(QueryStructure::QUERY_IDENTIFIER, $identifier);
 
 		return $this;
 	}

Braces +3 added lines, -2 removed lines

@@ -28,8 +28,9 @@
 
 	protected function getExplainSyntax()
 	{
-		if($this->queryStructure->getElement(QueryStructure::EXPLAIN))
-			return 'EXPLAIN';
+		if($this->queryStructure->getElement(QueryStructure::EXPLAIN)) {
+					return 'EXPLAIN';
+		}
 
 		return '';
 	}

src/Traits/ColumnValidation.php

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

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

Spacing +9 added lines, -9 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 ) {
+		foreach ($bindParams as $key => $value) {
 			$search[] = ':' . $key;
-			$replace[] = DbConnect::getInstance()->quote( $value );
+			$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/SelectFields.php

Spacing +17 added lines, -17 removed lines

@@ -22,31 +22,31 @@ 
 	 * @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 ) );
+				if (count($fields))
+					$this->queryStructure->setElement(QueryStructure::FIELDS, implode(', ', $fields));
 				else
-					$this->queryStructure->setElement( QueryStructure::FIELDS, '*' );
+					$this->queryStructure->setElement(QueryStructure::FIELDS, '*');
 				break;
 
 			case QueryStructure::ELEMENT_TYPE_STRING:
 
-				$fields = trim( $fields );
-				if ( '' !== $fields )
-					$this->queryStructure->setElement( QueryStructure::FIELDS, $fields );
+				$fields = trim($fields);
+				if ('' !== $fields)
+					$this->queryStructure->setElement(QueryStructure::FIELDS, $fields);
 				else
-					$this->queryStructure->setElement( QueryStructure::FIELDS, '*' );
+					$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);
 
 		}
 
@@ -58,16 +58,16 @@ 
 	 * @return array
 	 * @throws QueryException
 	 */
-	private function prepareArrayFields( $fieldsArray = array() )
+	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;

Braces +16 added lines, -12 removed lines

@@ -30,19 +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:
@@ -63,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;