From c5336d4a35ea49345756fa42d96dfcc246888616 Mon Sep 17 00:00:00 2001 From: anton-zamniborshch Date: Mon, 29 Mar 2021 18:01:30 +0300 Subject: [PATCH 1/4] Add query params for failError() method --- qa-src/Database/DbConnection.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qa-src/Database/DbConnection.php b/qa-src/Database/DbConnection.php index 948b1beb0..993e0f100 100644 --- a/qa-src/Database/DbConnection.php +++ b/qa-src/Database/DbConnection.php @@ -150,15 +150,16 @@ public function disconnect() * @param int $errno * @param string $error * @param string $query + * @param array|null * @return mixed */ - public function failError($type, $errno = null, $error = null, $query = null) + public function failError($type, $errno = null, $error = null, $query = null, $params = null) { @error_log('PHP Question2Answer MySQL ' . $type . ' error ' . $errno . ': ' . $error . (isset($query) ? (' - Query: ' . $query) : '')); if (function_exists($this->failHandler)) { $failFunc = $this->failHandler; - $failFunc($type, $errno, $error, $query); + $failFunc($type, $errno, $error, $query, $params); } else { echo sprintf( '
Database %s

%s

%s
', @@ -208,7 +209,7 @@ public function query($query, $params = []) return new DbResult($stmt); } catch (PDOException $ex) { - $this->failError('query', $ex->getCode(), $ex->getMessage(), $query); + $this->failError('query', $ex->getCode(), $ex->getMessage(), $query, $params); } } From 3bff359e6d15c4b8a3d08b9a0fa7597c94c23495 Mon Sep 17 00:00:00 2001 From: anton-zamniborshch Date: Mon, 29 Mar 2021 18:15:32 +0300 Subject: [PATCH 2/4] Fix PHPDoc --- qa-src/Database/DbConnection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-src/Database/DbConnection.php b/qa-src/Database/DbConnection.php index 993e0f100..8506ea649 100644 --- a/qa-src/Database/DbConnection.php +++ b/qa-src/Database/DbConnection.php @@ -150,7 +150,7 @@ public function disconnect() * @param int $errno * @param string $error * @param string $query - * @param array|null + * @param array|null $params * @return mixed */ public function failError($type, $errno = null, $error = null, $query = null, $params = null) From 8e246b056a48abb3a7661c62c6138b4ddda44cbd Mon Sep 17 00:00:00 2001 From: anton-zamniborshch Date: Mon, 29 Mar 2021 18:22:47 +0300 Subject: [PATCH 3/4] Change PHPDoc to tab --- qa-src/Database/DbConnection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-src/Database/DbConnection.php b/qa-src/Database/DbConnection.php index 8506ea649..aa247c434 100644 --- a/qa-src/Database/DbConnection.php +++ b/qa-src/Database/DbConnection.php @@ -150,7 +150,7 @@ public function disconnect() * @param int $errno * @param string $error * @param string $query - * @param array|null $params + * @param array|null $params * @return mixed */ public function failError($type, $errno = null, $error = null, $query = null, $params = null) From 7a6ba0983987e165fc330dcff58afd1ac5a55e6b Mon Sep 17 00:00:00 2001 From: anton-zamniborshch Date: Mon, 29 Mar 2021 18:55:38 +0300 Subject: [PATCH 4/4] Change PHPDoc to tab --- qa-src/Database/DbConnection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-src/Database/DbConnection.php b/qa-src/Database/DbConnection.php index aa247c434..8506ea649 100644 --- a/qa-src/Database/DbConnection.php +++ b/qa-src/Database/DbConnection.php @@ -150,7 +150,7 @@ public function disconnect() * @param int $errno * @param string $error * @param string $query - * @param array|null $params + * @param array|null $params * @return mixed */ public function failError($type, $errno = null, $error = null, $query = null, $params = null)