From 34c74400a471b31fea22ea85636f47c76d783710 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 25 Feb 2021 17:10:03 +0300
Subject: enforce some stricter type checking for loggers

---
 classes/logger/adapter.php | 4 ++++
 classes/logger/sql.php     | 8 +++-----
 classes/logger/stdout.php  | 4 ++--
 classes/logger/syslog.php  | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 classes/logger/adapter.php

(limited to 'classes/logger')

diff --git a/classes/logger/adapter.php b/classes/logger/adapter.php
new file mode 100644
index 000000000..79f641441
--- /dev/null
+++ b/classes/logger/adapter.php
@@ -0,0 +1,4 @@
+<?php
+interface Logger_Adapter {
+   function log_error(int $errno, string $errstr, string $file, int $line, $context);
+}
\ No newline at end of file
diff --git a/classes/logger/sql.php b/classes/logger/sql.php
index ad7fdecb2..f88621fbe 100755
--- a/classes/logger/sql.php
+++ b/classes/logger/sql.php
@@ -1,17 +1,15 @@
 <?php
-class Logger_SQL {
+class Logger_SQL implements Logger_Adapter {
 
 	private $pdo;
 
-	function log_error($errno, $errstr, $file, $line, $context) {
+	function log_error(int $errno, string $errstr, string $file, int $line, $context) {
 
 		// separate PDO connection object is used for logging
 		if (!$this->pdo) $this->pdo = Db::instance()->pdo_connect();
 
 		if ($this->pdo && get_schema_version() > 117) {
 
-			$owner_uid = $_SESSION["uid"] ?? null;
-
 			// limit context length, DOMDocument dumps entire XML in here sometimes, which may be huge
 			$context = mb_substr($context, 0, 8192);
 
@@ -37,7 +35,7 @@ class Logger_SQL {
 			$sth = $this->pdo->prepare("INSERT INTO ttrss_error_log
 				(errno, errstr, filename, lineno, context, owner_uid, created_at) VALUES
 				(?, ?, ?, ?, ?, ?, NOW())");
-			$sth->execute([$errno, $errstr, $file, $line, $context, $owner_uid]);
+			$sth->execute([$errno, $errstr, $file, $line, $context, $_SESSION["uid"] ?? null]);
 
 			return $sth->rowCount();
 		}
diff --git a/classes/logger/stdout.php b/classes/logger/stdout.php
index 645fe8ecf..e906853ce 100644
--- a/classes/logger/stdout.php
+++ b/classes/logger/stdout.php
@@ -1,7 +1,7 @@
 <?php
-class Logger_Stdout {
+class Logger_Stdout implements Logger_Adapter {
 
-	function log_error($errno, $errstr, $file, $line, $context) {
+	function log_error(int $errno, string $errstr, string $file, int $line, $context) {
 
 		switch ($errno) {
 		case E_ERROR:
diff --git a/classes/logger/syslog.php b/classes/logger/syslog.php
index 2dd3c4dfd..3ad9858f3 100644
--- a/classes/logger/syslog.php
+++ b/classes/logger/syslog.php
@@ -1,7 +1,7 @@
 <?php
-class Logger_Syslog {
+class Logger_Syslog implements Logger_Adapter {
 
-	function log_error($errno, $errstr, $file, $line, $context) {
+	function log_error(int $errno, string $errstr, string $file, int $line, $context) {
 
 		switch ($errno) {
 		case E_ERROR:
-- 
cgit v1.2.3