Fixed logging

Author: rkrx

composer.json

@@ -31,10 +31,5 @@
 	"scripts": {
 		"phpunit": "phpunit -c tests.xml",
 		"phpstan": "phpstan analyse -c phpstan.neon"
-	},
-	"config": {
-		"platform": {
-			"php": "7.1.10"
-		}
 	}
 }

src/Builder/QueryStatement.php

@@ -63,11 +63,13 @@ public function setFetchMode(int $mode = PDO::FETCH_ASSOC, $arg0 = null, ?array
 	 * @return $this
 	 */
 	public function execute(array $params = []) {
-		$this->exceptionHandler($this->query, function() use ($params) {
-			$response = $this->statement->execute($params);
-			if(!$response) {
-				throw new SqlException('Execution returned with "false".');
-			}
+		$this->exceptionHandler(function() use ($params) {
+			$this->queryLoggers->logRegion($this->query, function() use ($params) {
+				$response = $this->statement->execute($params);
+				if(!$response) {
+					throw new SqlException('Execution returned with "false".');
+				}
+			});
 		});
 		return $this;
 	}
@@ -79,11 +81,13 @@ public function execute(array $params = []) {
 	 * @return array<mixed, mixed>
 	 */
 	public function fetchAll($fetchStyle = PDO::FETCH_ASSOC, $fetchArgument = null, array $ctorArgs = []): array {
-		$result = $this->exceptionHandler($this->query, function() use ($fetchStyle, $fetchArgument, $ctorArgs) {
-			if($fetchArgument !== null) {
-				return $this->statement->fetchAll($fetchStyle, $fetchArgument, ...$ctorArgs);
-			}
-			return $this->statement->fetchAll($fetchStyle);
+		$result = $this->exceptionHandler(function() use ($fetchStyle, $fetchArgument, $ctorArgs) {
+			return $this->queryLoggers->logRegion($this->query, function () use ($fetchStyle, $fetchArgument, $ctorArgs) {
+				if($fetchArgument !== null) {
+					return $this->statement->fetchAll($fetchStyle, $fetchArgument, ...$ctorArgs);
+				}
+				return $this->statement->fetchAll($fetchStyle);
+			});
 		});
 		if(is_bool($result)) {
 			return [];
@@ -98,8 +102,10 @@ public function fetchAll($fetchStyle = PDO::FETCH_ASSOC, $fetchArgument = null,
 	 * @return mixed
 	 */
 	public function fetch($fetchStyle = PDO::FETCH_ASSOC, $cursorOrientation = PDO::FETCH_ORI_NEXT, $cursorOffset = 0) {
-		return $this->exceptionHandler($this->query, function() use ($fetchStyle, $cursorOrientation, $cursorOffset) {
-			return $this->statement->fetch($fetchStyle, $cursorOrientation, $cursorOffset);
+		return $this->exceptionHandler(function() use ($fetchStyle, $cursorOrientation, $cursorOffset) {
+			return $this->queryLoggers->logRegion($this->query, function () use ($fetchStyle, $cursorOrientation, $cursorOffset) {
+				return $this->statement->fetch($fetchStyle, $cursorOrientation, $cursorOffset);
+			});
 		});
 	}
 
@@ -108,16 +114,18 @@ public function fetch($fetchStyle = PDO::FETCH_ASSOC, $cursorOrientation = PDO::
 	 * @return mixed
 	 */
 	public function fetchColumn($columnNo = 0) {
-		return $this->exceptionHandler($this->query, function() use ($columnNo) {
-			return $this->statement->fetchColumn($columnNo);
+		return $this->exceptionHandler(function() use ($columnNo) {
+			return $this->queryLoggers->logRegion($this->query, function () use ($columnNo) {
+				return $this->statement->fetchColumn($columnNo);
+			});
 		});
 	}
 
 	/**
 	 * @return bool
 	 */
 	public function closeCursor(): bool {
-		return $this->exceptionHandler($this->query, function() {
+		return $this->exceptionHandler(function() {
 			return $this->statement->closeCursor();
 		});
 	}
@@ -126,7 +134,7 @@ public function closeCursor(): bool {
 	 * @return int
 	 */
 	public function columnCount(): int {
-		return $this->exceptionHandler($this->query, function() {
+		return $this->exceptionHandler(function() {
 			return $this->statement->columnCount();
 		});
 	}
@@ -136,7 +144,7 @@ public function columnCount(): int {
 	 * @return null|array<string, mixed>
 	 */
 	public function getColumnMeta(int $columnNo): ?array {
-		return $this->exceptionHandler($this->query, function() use ($columnNo) {
+		return $this->exceptionHandler(function() use ($columnNo) {
 			$columnMeta = $this->statement->getColumnMeta($columnNo);
 			if($columnMeta === false) {
 				return null;
@@ -150,13 +158,11 @@ public function getColumnMeta(int $columnNo): ?array {
 	 * @param callable(): T $fn
 	 * @return T
 	 */
-	private function exceptionHandler(string $query, callable $fn) {
-		return $this->queryLoggers->logRegion($query, function () use ($fn) {
-			try {
-				return $fn();
-			} catch (PDOException $exception) {
-				throw $this->exceptionInterpreter->getMoreConcreteException($exception);
-			}
-		});
+	private function exceptionHandler(callable $fn) {
+		try {
+			return $fn();
+		} catch (PDOException $exception) {
+			throw $this->exceptionInterpreter->getMoreConcreteException($exception);
+		}
 	}
 }

src/Builder/Traits/OrderByBuilder.php

@@ -40,9 +40,7 @@ public function orderByValues(string $fieldName, array $values) {
 	}
 
 	/**
-	 * @param string $fieldName
-	 * @param array<int, int|float|string> $values
-	 * @return
+	 * @return array<int, array{string, string}>
 	 */
 	public function getOrderBy() {
 		return $this->orderBy;