adumitru68 / QueryBuilder

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 === self::$instance ) {
+		if (null === self::$instance) {
 			self::$instance = new self();
 		}
 

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 === self::$instance ) {
+		if (null === self::$instance) {
 			self::$instance = new self();
 		}
 

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 === self::$instance ) {
+		if (null === self::$instance) {
 			self::$instance = new self();
 		}