adumitru68 / QueryBuilder

src/Dependencies/QueryHelper.php

Spacing +43 added lines, -43 removed lines

@@ -15,10 +15,10 @@ 
 	 * @param string $string
 	 * @return mixed|string
 	 */
-	public static function clearMultipleSpaces( $string = '' )
+	public static function clearMultipleSpaces($string = '')
 	{
-		$string = preg_replace( '/\s+/', ' ', $string );
-		$string = trim( $string );
+		$string = preg_replace('/\s+/', ' ', $string);
+		$string = trim($string);
 
 		return $string;
 	}
@@ -27,11 +27,11 @@ 
 	 * @param $val
 	 * @return bool
 	 */
-	public static function isInteger( $val )
+	public static function isInteger($val)
 	{
-		$val = trim( $val );
+		$val = trim($val);
 
-		return is_numeric( $val ) && floor( $val ) == $val;
+		return is_numeric($val) && floor($val) == $val;
 	}
 
 	/**
@@ -39,34 +39,34 @@ 
 	 * @return bool
 	 * @i
 	 */
-	public static function isDecimal( $val )
+	public static function isDecimal($val)
 	{
-		$val = trim( $val );
+		$val = trim($val);
 
-		return is_numeric( $val ) && floor( $val ) != $val;
+		return is_numeric($val) && floor($val) != $val;
 	}
 
-	public static function isValidOrderBy( $order_by_parameter )
+	public static function isValidOrderBy($order_by_parameter)
 	{
 
-		$columns = array( 'first_name', 'last_name', 'zip', 'created_at' );
+		$columns = array('first_name', 'last_name', 'zip', 'created_at');
 
-		$parts = preg_split( "/[\s,]+/", $order_by_parameter );
+		$parts = preg_split("/[\s,]+/", $order_by_parameter);
 
-		foreach ( $parts as $part ) {
-			$subparts = preg_split( "/\s+/", $part );
+		foreach ($parts as $part) {
+			$subparts = preg_split("/\s+/", $part);
 
-			if ( count( $subparts ) < 0 || count( $subparts ) > 2 ) {
+			if (count($subparts) < 0 || count($subparts) > 2) {
 				// Too many or too few parts.
 				return false;
 			}
 
-			if ( !in_array( $subparts[0], $columns ) ) {
+			if (!in_array($subparts[0], $columns)) {
 				// Column name is invalid.
 				return false;
 			}
 
-			if ( count( $subparts ) == 2 && !in_array( strtoupper( $subparts[1] ), array( 'ASC', 'DESC' ) ) ) {
+			if (count($subparts) == 2 && !in_array(strtoupper($subparts[1]), array('ASC', 'DESC'))) {
 				// ASC or DESC is invalid
 				return false;
 			}
@@ -81,23 +81,23 @@ 
 	 * @param string $delimiter
 	 * @return array
 	 */
-	public static function explode( $string, $delimiter = ',' )
+	public static function explode($string, $delimiter = ',')
 	{
-		$brutArray = explode( $delimiter, $string );
+		$brutArray = explode($delimiter, $string);
 		$newArray = array();
-		foreach ( $brutArray as $value ) {
-			$value = trim( $value );
-			if ( '' !== $value ) $newArray[] = $value;
+		foreach ($brutArray as $value) {
+			$value = trim($value);
+			if ('' !== $value) $newArray[] = $value;
 		}
 
 		return $newArray;
 	}
 
-	public static function alphaNum( $string )
+	public static function alphaNum($string)
 	{
-		$string = preg_replace( "/[^a-zA-Z0-9 _,]+/", "", $string );
+		$string = preg_replace("/[^a-zA-Z0-9 _,]+/", "", $string);
 
-		return self::clearMultipleSpaces( $string );
+		return self::clearMultipleSpaces($string);
 	}
 
 	/**
@@ -105,12 +105,12 @@ 
 	 * @param string $delimiter
 	 * @return string
 	 */
-	public static function implode( array $array, $delimiter = ',' )
+	public static function implode(array $array, $delimiter = ',')
 	{
-		$string = implode( $delimiter, $array );
-		$string = trim( $string );
-		$string = trim( $string, trim( $delimiter ) );
-		$string = trim( $string );
+		$string = implode($delimiter, $array);
+		$string = trim($string);
+		$string = trim($string, trim($delimiter));
+		$string = trim($string);
 
 		return $string;
 	}
@@ -119,36 +119,36 @@ 
 	 * @param $string
 	 * @return mixed|string
 	 */
-	public static function clearQuotes( $string )
+	public static function clearQuotes($string)
 	{
-		$search = array( '"', "'" );
+		$search = array('"', "'");
 		$replace = '';
-		$string = str_replace( $search, $replace, $string );
+		$string = str_replace($search, $replace, $string);
 
-		return self::clearMultipleSpaces( $string );
+		return self::clearMultipleSpaces($string);
 	}
 
 	/**
 	 * @param int $length
 	 * @return string
 	 */
-	public static function random( $length = 5 )
+	public static function random($length = 5)
 	{
 		$characters = 'abcdefghijklmnopqrstuvwxyz';
-		$charactersLength = strlen( $characters );
+		$charactersLength = strlen($characters);
 		$randomString = '';
-		for ( $i = 0; $i < $length; $i++ )
-			$randomString .= $characters[ rand( 0, $charactersLength - 1 ) ];
+		for ($i = 0; $i < $length; $i++)
+			$randomString .= $characters[rand(0, $charactersLength - 1)];
 
-		return str_shuffle( $randomString );
+		return str_shuffle($randomString);
 	}
 
-	public static function limitString( $rowCount, $offset = null )
+	public static function limitString($rowCount, $offset = null)
 	{
-		$rowCount = intval( $rowCount );
-		if ( is_null( $offset ) )
+		$rowCount = intval($rowCount);
+		if (is_null($offset))
 			return $rowCount;
-		$offset = intval( $offset );
+		$offset = intval($offset);
 
 		return "$offset, $rowCount";
 	}

Braces +9 added lines, -5 removed lines

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

src/Dependencies/QueryStructure.php

Spacing +34 added lines, -34 removed lines

@@ -85,8 +85,8 @@ 
 	{
 		$this->syntaxEL = $this->init();
 
-		foreach ( $this->syntaxEL as $name => $value )
-			$this->typeEL[ $name ] = gettype( $value );
+		foreach ($this->syntaxEL as $name => $value)
+			$this->typeEL[$name] = gettype($value);
 
 	}
 
@@ -128,9 +128,9 @@ 
 
 	private function makeStatementInstance()
 	{
-		$instance = QueryHelper::random( 5 );
-		while ( in_array( $instance, self::$usedInstanceIds ) ) {
-			$instance = QueryHelper::random( 7 );
+		$instance = QueryHelper::random(5);
+		while (in_array($instance, self::$usedInstanceIds)) {
+			$instance = QueryHelper::random(7);
 		}
 		self::$usedInstanceIds[] = $instance;
 
@@ -158,7 +158,7 @@ 
 	/**
 	 * @param $elements
 	 */
-	public function setAllElements( $elements )
+	public function setAllElements($elements)
 	{
 		$this->syntaxEL = $elements;
 	}
@@ -170,18 +170,18 @@ 
 	 * @return bool
 	 * @throws QueryException
 	 */
-	public function setElement( $name, $value )
+	public function setElement($name, $value)
 	{
-		if ( !array_key_exists( $name, $this->syntaxEL ) )
-			throw new QueryException( 'Invalid Query property', QueryException::QUERY_ERROR_ELEMENT_NOT_FOUND );
+		if (!array_key_exists($name, $this->syntaxEL))
+			throw new QueryException('Invalid Query property', QueryException::QUERY_ERROR_ELEMENT_NOT_FOUND);
 
-		if ( $name == self::TABLE && is_a( $value, QueryStatement::class ) )
+		if ($name == self::TABLE && is_a($value, QueryStatement::class))
 			return true;
 
-		if ( $this->typeEL[ $name ] === self::ELEMENT_TYPE_ARRAY )
-			$this->syntaxEL[ $name ][] = $value;
+		if ($this->typeEL[$name] === self::ELEMENT_TYPE_ARRAY)
+			$this->syntaxEL[$name][] = $value;
 		else
-			$this->syntaxEL[ $name ] = $value;
+			$this->syntaxEL[$name] = $value;
 
 		return true;
 	}
@@ -192,12 +192,12 @@ 
 	 * @param $elementValue
 	 * @throws QueryException
 	 */
-	public function replaceElement( $elementName, $elementValue )
+	public function replaceElement($elementName, $elementValue)
 	{
-		if ( !array_key_exists( $elementName, $this->syntaxEL ) )
-			throw new QueryException( 'Invalid Query property', QueryException::QUERY_ERROR_ELEMENT_NOT_FOUND );
+		if (!array_key_exists($elementName, $this->syntaxEL))
+			throw new QueryException('Invalid Query property', QueryException::QUERY_ERROR_ELEMENT_NOT_FOUND);
 
-		$this->syntaxEL[ $elementName ] = $elementValue;
+		$this->syntaxEL[$elementName] = $elementValue;
 	}
 
 
@@ -205,9 +205,9 @@ 
 	 * @param string $name
 	 * @return mixed
 	 */
-	public function getElement( $name )
+	public function getElement($name)
 	{
-		return $this->syntaxEL[ $name ];
+		return $this->syntaxEL[$name];
 	}
 
 
@@ -215,9 +215,9 @@ 
 	 * @param $name
 	 * @param $value
 	 */
-	public function setParams( $name, $value )
+	public function setParams($name, $value)
 	{
-		$this->syntaxEL[ QueryStructure::BIND_PARAMS ][ $name ] = $value;
+		$this->syntaxEL[QueryStructure::BIND_PARAMS][$name] = $value;
 	}
 
 
@@ -226,10 +226,10 @@ 
 	 * @param $value
 	 * @return string
 	 */
-	public function bindParam( $name, $value )
+	public function bindParam($name, $value)
 	{
-		$pdoName = $this->index( $name );
-		$this->syntaxEL[ QueryStructure::BIND_PARAMS ][ $pdoName ] = $value;
+		$pdoName = $this->index($name);
+		$this->syntaxEL[QueryStructure::BIND_PARAMS][$pdoName] = $value;
 
 		return ':' . $pdoName;
 	}
@@ -241,27 +241,27 @@ 
 	 * @param string $search
 	 * @return string
 	 */
-	public function bindParamsExpression( $expression, array $params = [], $search = '?' )
+	public function bindParamsExpression($expression, array $params = [], $search = '?')
 	{
-		if ( !count( $params ) )
+		if (!count($params))
 			return $expression;
 
-		if ( strpos( $expression, $search ) === false )
+		if (strpos($expression, $search) === false)
 			return $expression;
 
-		$params = array_slice( $params, 0, substr_count( $expression, $search ) );
+		$params = array_slice($params, 0, substr_count($expression, $search));
 
 		$i = 0;
 		$arrayReturn = [];
-		$expressionToArray = explode( $search, $expression );
+		$expressionToArray = explode($search, $expression);
 
-		foreach ( $expressionToArray as $sub ) {
+		foreach ($expressionToArray as $sub) {
 			$arrayReturn[] = $sub;
-			$arrayReturn[] = array_key_exists( $i, $params ) ? $this->bindParam( 'exp', $params[ $i ] ) : '';
+			$arrayReturn[] = array_key_exists($i, $params) ? $this->bindParam('exp', $params[$i]) : '';
 			$i++;
 		}
 
-		return implode( '', $arrayReturn );
+		return implode('', $arrayReturn);
 	}
 
 
@@ -269,9 +269,9 @@ 
 	 * @param string $fieldName
 	 * @return string
 	 */
-	public function index( $fieldName = '' )
+	public function index($fieldName = '')
 	{
-		return trim( $fieldName ) . '_' . $this->syntaxEL[ self::INSTANCE ] . '_' . ++$this->counter . 'i';
+		return trim($fieldName) . '_' . $this->syntaxEL[self::INSTANCE] . '_' . ++$this->counter . 'i';
 	}
 
 }
\ No newline at end of file

Braces +23 added lines, -16 removed lines

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

src/Dependencies/QueryTimer.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 
 	public function __construct()
 	{
-		$this->queryStart = microtime( true );
+		$this->queryStart = microtime(true);
 	}
 
 	/**
@@ -31,7 +31,7 @@ 
 	 */
 	public function getDuration()
 	{
-		$this->queryEnd = microtime( true );
+		$this->queryEnd = microtime(true);
 
 		return $this->queryEnd - $this->queryStart;
 	}

src/DB/DbLog.php

Spacing +24 added lines, -24 removed lines

@@ -30,7 +30,7 @@ 
 	 */
 	private function __construct()
 	{
-		$this->dateTimeZone = new \DateTimeZone( 'Europe/Bucharest' );
+		$this->dateTimeZone = new \DateTimeZone('Europe/Bucharest');
 	}
 
 
@@ -38,61 +38,61 @@ 
 	 * @param $query
 	 * @param $duration
 	 */
-	public function writeQueryDuration( $query, $duration )
+	public function writeQueryDuration($query, $duration)
 	{
-		$backtrace = end( debug_backtrace() );
+		$backtrace = end(debug_backtrace());
 		$location = $backtrace['file'] . " Line: " . $backtrace['line'];
 
 		$this->path = DbConfig::getInstance()->getLogPathQueryDuration(); //my comments
-		$message = "Duration: " . round( $duration, 5 ) . "\r\n";
+		$message = "Duration: " . round($duration, 5) . "\r\n";
 		$message .= "Location: $location\r\n";
 		$message .= "Query: $query";
-		$this->write( $message );
+		$this->write($message);
 	}
 
 	/**
 	 * @param $query
 	 * @param $duration
 	 */
-	public function writeQueryErros( $query, $code, $error )
+	public function writeQueryErros($query, $code, $error)
 	{
-		$backtrace = end( debug_backtrace() );
+		$backtrace = end(debug_backtrace());
 		$location = $backtrace['file'] . " Line: " . $backtrace['line'];
 
 		$this->path = DbConfig::getInstance()->getLogPathErrors(); //my comments
 		$message = "Query: $query" . "\r\n";
 		$message .= "Location: $location\r\n";
 		$message .= "Error code : " . $code . "\r\n";
-		$message .= "" . $error ;
+		$message .= "" . $error;
 
-		$this->write( $message );
+		$this->write($message);
 	}
 
 
-	public function write( $message )
+	public function write($message)
 	{
 
 		$date = new \DateTime();
-		$date->setTimezone( $this->dateTimeZone );
+		$date->setTimezone($this->dateTimeZone);
 
-		$log = $this->path . $date->format( 'Y-m-d' ) . ".txt";
-		$time = $date->format( 'H:i:s' );
+		$log = $this->path . $date->format('Y-m-d') . ".txt";
+		$time = $date->format('H:i:s');
 
 		$messageFormat = "[$time]\r\n$message\r\n\r\n";
 
-		if ( is_dir( $this->path ) ) {
-			if ( !file_exists( $log ) ) {
-				$fh = fopen( $log, 'a+' ) or die( "Fatal Error !" );
-				fwrite( $fh, $messageFormat );
-				fclose( $fh );
+		if (is_dir($this->path)) {
+			if (!file_exists($log)) {
+				$fh = fopen($log, 'a+') or die("Fatal Error !");
+				fwrite($fh, $messageFormat);
+				fclose($fh);
 			}
 			else {
-				$this->edit( $log, $date, $messageFormat );
+				$this->edit($log, $date, $messageFormat);
 			}
 		}
 		else {
-			if ( mkdir( $this->path, 0777 ) === true ) {
-				$this->write( $message );
+			if (mkdir($this->path, 0777) === true) {
+				$this->write($message);
 			}
 		}
 	}
@@ -103,9 +103,9 @@ 
 	 * @param \DateTime $date
 	 * @param  string $message
 	 */
-	private function edit( $log, \DateTime $date, $message )
+	private function edit($log, \DateTime $date, $message)
 	{
-		file_put_contents( $log, $message, FILE_APPEND );
+		file_put_contents($log, $message, FILE_APPEND);
 	}
 
 
@@ -114,7 +114,7 @@ 
 	 */
 	public static function getInstance()
 	{
-		if ( null === static::$instance ) {
+		if (null === static::$instance) {
 			static::$instance = new static();
 		}
 

Braces +2 added lines, -4 removed lines

@@ -85,12 +85,10 @@
 				$fh = fopen( $log, 'a+' ) or die( "Fatal Error !" );
 				fwrite( $fh, $messageFormat );
 				fclose( $fh );
-			}
-			else {
+			} else {
 				$this->edit( $log, $date, $messageFormat );
 			}
-		}
-		else {
+		} else {
 			if ( mkdir( $this->path, 0777 ) === true ) {
 				$this->write( $message );
 			}

src/DB/DbService.php

Spacing +61 added lines, -61 removed lines

@@ -52,22 +52,22 @@ 
 	 * @param int $fetchMode
 	 * @return array|int|null
 	 */
-	public function query( $query, $params = null, $fetchMode = \PDO::FETCH_ASSOC )
+	public function query($query, $params = null, $fetchMode = \PDO::FETCH_ASSOC)
 	{
 
-		$query = trim( str_replace( "\r", " ", $query ) );
-		$statement = self::getQueryStatement( $query );
+		$query = trim(str_replace("\r", " ", $query));
+		$statement = self::getQueryStatement($query);
 
-		$this->queryInit( $query, $params );
+		$this->queryInit($query, $params);
 
-		if ( $statement === self::QUERY_TYPE_SELECT ||
+		if ($statement === self::QUERY_TYPE_SELECT ||
 			$statement === self::QUERY_TYPE_SHOW ||
 			$statement === self::QUERY_TYPE_DESC ||
 			$statement === self::QUERY_TYPE_EXPLAIN
 		) {
-			return $this->sQuery->fetchAll( $fetchMode );
+			return $this->sQuery->fetchAll($fetchMode);
 		}
-		elseif ( $statement === self::QUERY_TYPE_INSERT ||
+		elseif ($statement === self::QUERY_TYPE_INSERT ||
 			$statement === self::QUERY_TYPE_UPDATE ||
 			$statement === self::QUERY_TYPE_DELETE
 		) {
@@ -84,46 +84,46 @@ 
 	 * @param null $params
 	 * @return array|null
 	 */
-	public function column( $query, $params = null )
+	public function column($query, $params = null)
 	{
-		$this->queryInit( $query, $params );
+		$this->queryInit($query, $params);
 
-		$query = trim( str_replace( "\r", " ", $query ) );
-		$statement = self::getQueryStatement( $query );
+		$query = trim(str_replace("\r", " ", $query));
+		$statement = self::getQueryStatement($query);
 
-		if ( $statement === self::QUERY_TYPE_EXPLAIN )
-			return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC );
+		if ($statement === self::QUERY_TYPE_EXPLAIN)
+			return $this->sQuery->fetchAll(\PDO::FETCH_ASSOC);
 
-		$Columns = $this->sQuery->fetchAll( \PDO::FETCH_NUM );
+		$Columns = $this->sQuery->fetchAll(\PDO::FETCH_NUM);
 
 		$column = null;
 
-		foreach ( $Columns as $cells ) {
+		foreach ($Columns as $cells) {
 			$column[] = $cells[0];
 		}
 
 		return $column;
 	}
 
-	public function row( $query, $params = null, $fetchmode = \PDO::FETCH_ASSOC )
+	public function row($query, $params = null, $fetchmode = \PDO::FETCH_ASSOC)
 	{
-		$this->queryInit( $query, $params );
+		$this->queryInit($query, $params);
 
-		$query = trim( str_replace( "\r", " ", $query ) );
-		$statement = self::getQueryStatement( $query );
+		$query = trim(str_replace("\r", " ", $query));
+		$statement = self::getQueryStatement($query);
 
-		if ( $statement === self::QUERY_TYPE_EXPLAIN )
-			return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC );
+		if ($statement === self::QUERY_TYPE_EXPLAIN)
+			return $this->sQuery->fetchAll(\PDO::FETCH_ASSOC);
 
-		$result = $this->sQuery->fetch( $fetchmode );
+		$result = $this->sQuery->fetch($fetchmode);
 		$this->sQuery->closeCursor(); // Frees up the connection to the server so that other SQL statements may be issued,
 
 		return $result;
 	}
 
-	public function single( $query, $params = null )
+	public function single($query, $params = null)
 	{
-		$this->queryInit( $query, $params );
+		$this->queryInit($query, $params);
 		$result = $this->sQuery->fetchColumn();
 		$this->sQuery->closeCursor(); // Frees up the connection to the server so that other SQL statements may be issued
 
@@ -135,57 +135,57 @@ 
 	 * @param string $query
 	 * @param array $parameters
 	 */
-	private function queryInit( $query, $parameters = [] )
+	private function queryInit($query, $parameters = [])
 	{
-		$this->pdo = DbConnect::getInstance()->getConnection( self::getQueryStatement( $query ) );
-		$startQueryTime = microtime( true );
+		$this->pdo = DbConnect::getInstance()->getConnection(self::getQueryStatement($query));
+		$startQueryTime = microtime(true);
 
 		try {
 
 			/**
 			 * Prepare query
 			 */
-			$this->sQuery = $this->pdo->prepare( $query );
+			$this->sQuery = $this->pdo->prepare($query);
 
 			/**
 			 * Add parameters to the parameter array
 			 */
-			if ( self::isArrayAssoc( $parameters ) )
-				$this->bindMore( $parameters );
+			if (self::isArrayAssoc($parameters))
+				$this->bindMore($parameters);
 			else
-				foreach ( $parameters as $key => $val )
-					$this->parameters[] = array( $key + 1, $val );
+				foreach ($parameters as $key => $val)
+					$this->parameters[] = array($key + 1, $val);
 
-			if ( count( $this->parameters ) ) {
-				foreach ( $this->parameters as $param => $value ) {
-					if ( is_int( $value[1] ) ) {
+			if (count($this->parameters)) {
+				foreach ($this->parameters as $param => $value) {
+					if (is_int($value[1])) {
 						$type = \PDO::PARAM_INT;
 					}
-					elseif ( is_bool( $value[1] ) ) {
+					elseif (is_bool($value[1])) {
 						$type = \PDO::PARAM_BOOL;
 					}
-					elseif ( is_null( $value[1] ) ) {
+					elseif (is_null($value[1])) {
 						$type = \PDO::PARAM_NULL;
 					}
 					else {
 						$type = \PDO::PARAM_STR;
 					}
-					$this->sQuery->bindValue( $value[0], $value[1], $type );
+					$this->sQuery->bindValue($value[0], $value[1], $type);
 				}
 			}
 
 			$this->sQuery->execute();
 
-			if ( DbConfig::getInstance()->isEnableLogQueryDuration() ) {
-				$duration = microtime( true ) - $startQueryTime;
-				DbLog::getInstance()->writeQueryDuration( $query, $duration );
+			if (DbConfig::getInstance()->isEnableLogQueryDuration()) {
+				$duration = microtime(true) - $startQueryTime;
+				DbLog::getInstance()->writeQueryDuration($query, $duration);
 			}
 
-		} catch ( \PDOException $e ) {
-			if ( DbConfig::getInstance()->isEnableLogErrors() ) {
-				DbLog::getInstance()->writeQueryErros( $query, $e->getCode(), $e->getMessage() );
+		} catch (\PDOException $e) {
+			if (DbConfig::getInstance()->isEnableLogErrors()) {
+				DbLog::getInstance()->writeQueryErros($query, $e->getCode(), $e->getMessage());
 			}
-			throw new \PDOException( $e->getMessage(), $e->getCode() );
+			throw new \PDOException($e->getMessage(), $e->getCode());
 		}
 
 		/**
@@ -195,19 +195,19 @@ 
 	}
 
 
-	public function bindMore( $parray )
+	public function bindMore($parray)
 	{
-		if ( !count( $this->parameters ) && is_array( $parray ) ) {
-			$columns = array_keys( $parray );
-			foreach ( $columns as $i => &$column ) {
-				$this->bind( $column, $parray[ $column ] );
+		if (!count($this->parameters) && is_array($parray)) {
+			$columns = array_keys($parray);
+			foreach ($columns as $i => &$column) {
+				$this->bind($column, $parray[$column]);
 			}
 		}
 	}
 
-	public function bind( $para, $value )
+	public function bind($para, $value)
 	{
-		$this->parameters[ sizeof( $this->parameters ) ] = [ ":" . $para, $value ];
+		$this->parameters[sizeof($this->parameters)] = [":" . $para, $value];
 	}
 
 
@@ -221,16 +221,16 @@ 
 	 * @param $queryString
 	 * @return string
 	 */
-	public static function getQueryStatement( $queryString )
+	public static function getQueryStatement($queryString)
 	{
-		$queryString = trim( $queryString );
+		$queryString = trim($queryString);
 
-		if ( $queryString === '' ) {
+		if ($queryString === '') {
 			return self::QUERY_TYPE_EMPTY;
 		}
 
-		if ( preg_match( '/^(select|insert|update|delete|replace|show|desc|explain)[\s]+/i', $queryString, $matches ) ) {
-			switch ( strtolower( $matches[1] ) ) {
+		if (preg_match('/^(select|insert|update|delete|replace|show|desc|explain)[\s]+/i', $queryString, $matches)) {
+			switch (strtolower($matches[1])) {
 				case 'select':
 					return self::QUERY_TYPE_SELECT;
 					break;
@@ -263,11 +263,11 @@ 
 	 * @param array $arr
 	 * @return bool
 	 */
-	public static function isArrayAssoc( array $arr )
+	public static function isArrayAssoc(array $arr)
 	{
-		if ( array() === $arr ) return false;
+		if (array() === $arr) return false;
 
-		return array_keys( $arr ) !== range( 0, count( $arr ) - 1 );
+		return array_keys($arr) !== range(0, count($arr) - 1);
 	}
 
 
@@ -276,7 +276,7 @@ 
 	 */
 	public static function getInstance()
 	{
-		if ( null === static::$instance ) {
+		if (null === static::$instance) {
 			static::$instance = new static();
 		}
 

Braces +20 added lines, -21 removed lines

@@ -66,14 +66,12 @@ 
 			$statement === self::QUERY_TYPE_EXPLAIN
 		) {
 			return $this->sQuery->fetchAll( $fetchMode );
-		}
-		elseif ( $statement === self::QUERY_TYPE_INSERT ||
+		} elseif ( $statement === self::QUERY_TYPE_INSERT ||
 			$statement === self::QUERY_TYPE_UPDATE ||
 			$statement === self::QUERY_TYPE_DELETE
 		) {
 			return $this->sQuery->rowCount();
-		}
-		else {
+		} else {
 
 			return NULL;
 		}
@@ -91,8 +89,9 @@ 
 		$query = trim( str_replace( "\r", " ", $query ) );
 		$statement = self::getQueryStatement( $query );
 
-		if ( $statement === self::QUERY_TYPE_EXPLAIN )
-			return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC );
+		if ( $statement === self::QUERY_TYPE_EXPLAIN ) {
+					return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC );
+		}
 
 		$Columns = $this->sQuery->fetchAll( \PDO::FETCH_NUM );
 
@@ -112,8 +111,9 @@ 
 		$query = trim( str_replace( "\r", " ", $query ) );
 		$statement = self::getQueryStatement( $query );
 
-		if ( $statement === self::QUERY_TYPE_EXPLAIN )
-			return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC );
+		if ( $statement === self::QUERY_TYPE_EXPLAIN ) {
+					return $this->sQuery->fetchAll( \PDO::FETCH_ASSOC );
+		}
 
 		$result = $this->sQuery->fetch( $fetchmode );
 		$this->sQuery->closeCursor(); // Frees up the connection to the server so that other SQL statements may be issued,
@@ -150,24 +150,22 @@ 
 			/**
 			 * Add parameters to the parameter array
 			 */
-			if ( self::isArrayAssoc( $parameters ) )
-				$this->bindMore( $parameters );
-			else
-				foreach ( $parameters as $key => $val )
+			if ( self::isArrayAssoc( $parameters ) ) {
+							$this->bindMore( $parameters );
+			} else {
+							foreach ( $parameters as $key => $val )
 					$this->parameters[] = array( $key + 1, $val );
+			}
 
 			if ( count( $this->parameters ) ) {
 				foreach ( $this->parameters as $param => $value ) {
 					if ( is_int( $value[1] ) ) {
 						$type = \PDO::PARAM_INT;
-					}
-					elseif ( is_bool( $value[1] ) ) {
+					} elseif ( is_bool( $value[1] ) ) {
 						$type = \PDO::PARAM_BOOL;
-					}
-					elseif ( is_null( $value[1] ) ) {
+					} elseif ( is_null( $value[1] ) ) {
 						$type = \PDO::PARAM_NULL;
-					}
-					else {
+					} else {
 						$type = \PDO::PARAM_STR;
 					}
 					$this->sQuery->bindValue( $value[0], $value[1], $type );
@@ -253,8 +251,7 @@ 
 					return self::QUERY_TYPE_OTHER;
 					break;
 			}
-		}
-		else {
+		} else {
 			return self::QUERY_TYPE_OTHER;
 		}
 	}
@@ -265,7 +262,9 @@ 
 	 */
 	public static function isArrayAssoc( array $arr )
 	{
-		if ( array() === $arr ) return false;
+		if ( array() === $arr ) {
+			return false;
+		}
 
 		return array_keys( $arr ) !== range( 0, count( $arr ) - 1 );
 	}

src/DB/DbConnect.php

Spacing +20 added lines, -20 removed lines

@@ -42,8 +42,8 @@ 
 	 */
 	public function getMasterConnection()
 	{
-		if ( !is_a( $this->pdoMaster, \PDO::class ) )
-			$this->pdoMaster = $this->connect( $this->config->getMasterDataConnect() );
+		if (!is_a($this->pdoMaster, \PDO::class))
+			$this->pdoMaster = $this->connect($this->config->getMasterDataConnect());
 
 		return $this->pdoMaster;
 	}
@@ -53,11 +53,11 @@ 
 	 */
 	public function getSlaveConnection()
 	{
-		if ( !$this->config->getReplicationEnable() )
+		if (!$this->config->getReplicationEnable())
 			return $this->getMasterConnection();
 
-		if ( !is_a( $this->pdoSlave, \PDO::class ) )
-			$this->pdoSlave = $this->connect( $this->config->getSlaveDataConnect() );
+		if (!is_a($this->pdoSlave, \PDO::class))
+			$this->pdoSlave = $this->connect($this->config->getSlaveDataConnect());
 
 		return $this->pdoSlave;
 	}
@@ -66,11 +66,11 @@ 
 	 * @param $statement
 	 * @return \PDO
 	 */
-	public function getConnection( $statement )
+	public function getConnection($statement)
 	{
-		$statement = trim( strtolower( $statement ) );
+		$statement = trim(strtolower($statement));
 
-		if ( $statement === DbService::QUERY_TYPE_SELECT )
+		if ($statement === DbService::QUERY_TYPE_SELECT)
 			return $this->getSlaveConnection();
 
 		return $this->getMasterConnection();
@@ -80,9 +80,9 @@ 
 	 * @param $string
 	 * @return string
 	 */
-	public function quote( $string )
+	public function quote($string)
 	{
-		return $this->getMasterConnection()->quote( $string );
+		return $this->getMasterConnection()->quote($string);
 	}
 
 	/**
@@ -97,22 +97,22 @@ 
 	 * @param $dataConnect
 	 * @return \PDO
 	 */
-	private function connect( $dataConnect )
+	private function connect($dataConnect)
 	{
 		$dsn = 'mysql:dbname=' . $dataConnect["dbname"] . ';host=' . $dataConnect["host"] . '';
 		try {
 
-			$pdo = new \PDO( $dsn, $dataConnect["user"], $dataConnect["password"],
-				array( \PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8" )
+			$pdo = new \PDO($dsn, $dataConnect["user"], $dataConnect["password"],
+				array(\PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8")
 			);
 
-			$pdo->setAttribute( \PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION );
-			$pdo->setAttribute( \PDO::ATTR_EMULATE_PREPARES, false );
-		} catch ( \PDOException $e ) {
-			if ( DbConfig::getInstance()->isEnableLogErrors() ) {
-				DbLog::getInstance()->writeQueryErros( 'Connection fail!', $e->getCode(), $e->getMessage() );
+			$pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+			$pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false);
+		} catch (\PDOException $e) {
+			if (DbConfig::getInstance()->isEnableLogErrors()) {
+				DbLog::getInstance()->writeQueryErros('Connection fail!', $e->getCode(), $e->getMessage());
 			}
-			throw new \PDOException( $e->getMessage(), $e->getCode() );
+			throw new \PDOException($e->getMessage(), $e->getCode());
 		}
 
 		return $pdo;
@@ -124,7 +124,7 @@ 
 	 */
 	public static function getInstance()
 	{
-		if ( null === static::$instance ) {
+		if (null === static::$instance) {
 			static::$instance = new static();
 		}
 

Braces +12 added lines, -8 removed lines

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

src/DB/DbConfig.php

Braces +11 added lines, -8 removed lines

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

Spacing +10 added lines, -10 removed lines

@@ -60,7 +60,7 @@ 
 	private function __construct()
 	{
 		$vendorCfg = __DIR__ . '/../../../../../vendor-cfg/qpdb_db_config.php';
-		if(file_exists($vendorCfg))
+		if (file_exists($vendorCfg))
 			$this->dbConfig = require $vendorCfg;
 		else
 			$this->dbConfig = require __DIR__ . '/../../config/qpdb_db_config.php';
@@ -72,7 +72,7 @@ 
 	 * @param string $fileConfig
 	 * @return $this
 	 */
-	public function withFileConfig( $fileConfig )
+	public function withFileConfig($fileConfig)
 	{
 		$this->dbConfig = require $fileConfig;
 		$this->buildConfig();
@@ -146,7 +146,7 @@ 
 
 	public function useTablePrefix()
 	{
-		if ( !empty( $this->dbConfig['use_table_prefix'] ) )
+		if (!empty($this->dbConfig['use_table_prefix']))
 			return $this->dbConfig['use_table_prefix'];
 
 		return false;
@@ -182,18 +182,18 @@ 
 	private function readMasterDataConnect()
 	{
 
-		if ( !isset( $this->dbConfig['master_data_connect'][0] ) )
-			throw new DbException( 'Master data connect is missing', DbException::DB_ERROR_MASTER_DATA_CONNECTION_MISSING );
+		if (!isset($this->dbConfig['master_data_connect'][0]))
+			throw new DbException('Master data connect is missing', DbException::DB_ERROR_MASTER_DATA_CONNECTION_MISSING);
 
 		$dataConnection = $this->dbConfig['master_data_connect'];
 
-		if ( !$this->replicationEnable || count( $dataConnection ) == 1 ) {
+		if (!$this->replicationEnable || count($dataConnection) == 1) {
 			$this->masterDataConnect = $dataConnection[0];
 
 			return true;
 		}
 
-		shuffle( $dataConnection );
+		shuffle($dataConnection);
 		$this->masterDataConnect = $dataConnection[0];
 
 		return true;
@@ -206,7 +206,7 @@ 
 	private function readSlaveDataConnect()
 	{
 
-		if ( !isset( $this->dbConfig['slave_data_connect'][0] ) ) {
+		if (!isset($this->dbConfig['slave_data_connect'][0])) {
 			$this->slaveDataConnect = $this->masterDataConnect;
 
 			return true;
@@ -214,7 +214,7 @@ 
 
 		$dataConnection = $this->dbConfig['slave_data_connect'];
 
-		shuffle( $dataConnection );
+		shuffle($dataConnection);
 		$this->slaveDataConnect = $dataConnection[0];
 
 		return true;
@@ -225,7 +225,7 @@ 
 	 */
 	public static function getInstance()
 	{
-		if ( null === static::$instance ) {
+		if (null === static::$instance) {
 			static::$instance = new self();
 		}
 

src/QueryBuild.php

Spacing +11 added lines, -11 removed lines

@@ -26,7 +26,7 @@ 
 	 * QueryBuild constructor.
 	 * @param $queryType
 	 */
-	protected function __construct( $queryType )
+	protected function __construct($queryType)
 	{
 		$this->queryType = $queryType;
 	}
@@ -35,45 +35,45 @@ 
 	 * @param $table
 	 * @return QuerySelect
 	 */
-	public static function select( $table )
+	public static function select($table)
 	{
-		return new QuerySelect( new QueryBuild( 0 ), $table );
+		return new QuerySelect(new QueryBuild(0), $table);
 	}
 
 	/**
 	 * @param $table
 	 * @return QueryUpdate
 	 */
-	public static function update( $table )
+	public static function update($table)
 	{
-		return new QueryUpdate( new QueryBuild( 0 ), $table );
+		return new QueryUpdate(new QueryBuild(0), $table);
 	}
 
 	/**
 	 * @param $table
 	 * @return QueryInsert
 	 */
-	public static function insert( $table )
+	public static function insert($table)
 	{
-		return new QueryInsert( new QueryBuild( 0 ), $table );
+		return new QueryInsert(new QueryBuild(0), $table);
 	}
 
 	/**
 	 * @param $table
 	 * @return QueryDelete
 	 */
-	public static function delete( $table )
+	public static function delete($table)
 	{
-		return new QueryDelete( new QueryBuild( 0 ), $table );
+		return new QueryDelete(new QueryBuild(0), $table);
 	}
 
 	/**
 	 * @param $query
 	 * @return QueryCustom
 	 */
-	public static function query( $query )
+	public static function query($query)
 	{
-		return new QueryCustom( new QueryBuild( 1 ), $query );
+		return new QueryCustom(new QueryBuild(1), $query);
 	}
 
 	/**

src/Statements/QueryUpdate.php

Spacing +12 added lines, -12 removed lines

@@ -39,12 +39,12 @@ 
 	 * @param QueryBuild $queryBuild
 	 * @param null $table
 	 */
-	public function __construct( QueryBuild $queryBuild, $table = null )
+	public function __construct(QueryBuild $queryBuild, $table = null)
 	{
-		parent::__construct( $queryBuild, $table );
+		parent::__construct($queryBuild, $table);
 	}
 
-	public function getSyntax( $replacement = self::REPLACEMENT_NONE )
+	public function getSyntax($replacement = self::REPLACEMENT_NONE)
 	{
 
 		$syntax = array();
@@ -62,17 +62,17 @@ 
 		/**
 		 * PRIORITY
 		 */
-		$syntax[] = $this->queryStructure->getElement( QueryStructure::PRIORITY );
+		$syntax[] = $this->queryStructure->getElement(QueryStructure::PRIORITY);
 
 		/**
 		 * IGNORE clause
 		 */
-		$syntax[] = $this->queryStructure->getElement( QueryStructure::IGNORE ) ? 'IGNORE' : '';
+		$syntax[] = $this->queryStructure->getElement(QueryStructure::IGNORE) ? 'IGNORE' : '';
 
 		/**
 		 * TABLE update
 		 */
-		$syntax[] = $this->queryStructure->getElement( QueryStructure::TABLE );
+		$syntax[] = $this->queryStructure->getElement(QueryStructure::TABLE);
 
 		/**
 		 * FIELDS update
@@ -94,9 +94,9 @@ 
 		 */
 		$syntax[] = $this->getLimitSyntax();
 
-		$syntax = implode( ' ', $syntax );
+		$syntax = implode(' ', $syntax);
 
-		return $this->getSyntaxReplace( $syntax, $replacement );
+		return $this->getSyntaxReplace($syntax, $replacement);
 
 	}
 
@@ -108,14 +108,14 @@ 
 	{
 
 		if (
-			$this->queryStructure->getElement( ( QueryStructure::WHERE_TRIGGER ) ) &&
-			!count( $this->queryStructure->getElement( QueryStructure::WHERE ) )
+			$this->queryStructure->getElement((QueryStructure::WHERE_TRIGGER)) &&
+			!count($this->queryStructure->getElement(QueryStructure::WHERE))
 		)
-			throw new QueryException( 'Where clause is required for this statement!', QueryException::QUERY_ERROR_DELETE_NOT_FILTER );
+			throw new QueryException('Where clause is required for this statement!', QueryException::QUERY_ERROR_DELETE_NOT_FILTER);
 
 		return DbService::getInstance()->query(
 			$this->getSyntax(),
-			$this->queryStructure->getElement( QueryStructure::BIND_PARAMS )
+			$this->queryStructure->getElement(QueryStructure::BIND_PARAMS)
 		);
 	}
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

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