From 58c2f095dc586b70407e2ea3da75c5e46764e0cf Mon Sep 17 00:00:00 2001 From: Lorenzo Yario Date: Sun, 22 Dec 2024 14:49:27 -0600 Subject: [PATCH 1/8] 7.4 compatibility --- inc/context.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/context.php b/inc/context.php index 9e5caef0..e047a782 100644 --- a/inc/context.php +++ b/inc/context.php @@ -16,7 +16,7 @@ class Context { $this->definitions = $definitions; } - public function get(string $name): mixed { + public function get(string $name){ if (!isset($this->definitions[$name])) { throw new \RuntimeException("Could not find a dependency named $name"); } From 6606c182b58ff4ef1a2ad70d6358a488168990ed Mon Sep 17 00:00:00 2001 From: Lorenzo Yario Date: Sun, 22 Dec 2024 14:51:07 -0600 Subject: [PATCH 2/8] 7.4 compatibility --- inc/mod/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/mod/auth.php b/inc/mod/auth.php index 43b5e8fc..311b9850 100644 --- a/inc/mod/auth.php +++ b/inc/mod/auth.php @@ -196,7 +196,7 @@ function modLog(string $action, ?string $_board = null): void { } } -function create_pm_header(): mixed { +function create_pm_header() { global $mod, $config; if ($config['cache']['enabled'] && ($header = cache::get('pm_unread_' . $mod['id'])) != false) { From 00fc21322c5cca3a398f0df9f08964a651f2db81 Mon Sep 17 00:00:00 2001 From: Lorenzo Yario Date: Sun, 22 Dec 2024 14:54:48 -0600 Subject: [PATCH 3/8] 7.4 compatibility --- inc/Data/Driver/HttpDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/Data/Driver/HttpDriver.php b/inc/Data/Driver/HttpDriver.php index 022fcbab..d23230df 100644 --- a/inc/Data/Driver/HttpDriver.php +++ b/inc/Data/Driver/HttpDriver.php @@ -98,7 +98,7 @@ class HttpDriver { * @return bool Returns true on success, false if the file was too large. * @throws RuntimeException Throws on IO error. */ - public function requestGetInto(string $endpoint, ?array $data, mixed $fd, int $timeout = 0): bool { + public function requestGetInto(string $endpoint, ?array $data, $fd, int $timeout = 0): bool { if (!empty($data)) { $endpoint .= '?' . \http_build_query($data); } From c4cd4d3c12c43b5f9d542e9e410edcc4d6934dd2 Mon Sep 17 00:00:00 2001 From: Lorenzo Yario Date: Sun, 22 Dec 2024 14:55:57 -0600 Subject: [PATCH 4/8] Update HttpDriver.php --- inc/Data/Driver/HttpDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/Data/Driver/HttpDriver.php b/inc/Data/Driver/HttpDriver.php index d23230df..989b47ae 100644 --- a/inc/Data/Driver/HttpDriver.php +++ b/inc/Data/Driver/HttpDriver.php @@ -8,7 +8,7 @@ defined('TINYBOARD') or exit; * Honestly this is just a wrapper for cURL. Still useful to mock it and have an OOP API on PHP 7. */ class HttpDriver { - private mixed $inner; + private $inner; private int $timeout; private int $max_file_size; From 40571f20018a6dc9dfb1f34c234d3ed3125b9600 Mon Sep 17 00:00:00 2001 From: Lorenzo Yario Date: Sun, 22 Dec 2024 14:59:12 -0600 Subject: [PATCH 5/8] 7.4 compatibility --- inc/bans.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/bans.php b/inc/bans.php index 58b054ec..91b21295 100644 --- a/inc/bans.php +++ b/inc/bans.php @@ -37,7 +37,7 @@ class Bans { } } - static private function findSingleAutoGc(string $ip, int $ban_id, bool $require_ban_view): array|null { + static private function findSingleAutoGc(string $ip, int $ban_id, bool $require_ban_view) { // Use OR in the query to also garbage collect bans. $query = prepare( 'SELECT ``bans``.* FROM ``bans`` @@ -70,7 +70,7 @@ class Bans { return $found_ban; } - static private function findSingleNoGc(int $ban_id): array|null { + static private function findSingleNoGc(int $ban_id) { $query = prepare( 'SELECT ``bans``.* FROM ``bans`` WHERE ``bans``.id = :id @@ -268,7 +268,7 @@ class Bans { return [$ipstart, $ipend]; } - static public function findSingle(string $ip, int $ban_id, bool $require_ban_view, bool $auto_gc): array|null { + static public function findSingle(string $ip, int $ban_id, bool $require_ban_view, bool $auto_gc) { if ($auto_gc) { return self::findSingleAutoGc($ip, $ban_id, $require_ban_view); } else { From 3b9b23035ea719ce19e4d05b19a32138ebb1681c Mon Sep 17 00:00:00 2001 From: Lorenzo Yario Date: Sun, 22 Dec 2024 15:02:58 -0600 Subject: [PATCH 6/8] 7.4 compatibility (updated) --- inc/bans.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/bans.php b/inc/bans.php index 91b21295..77b8e7f1 100644 --- a/inc/bans.php +++ b/inc/bans.php @@ -94,7 +94,7 @@ class Bans { } } - static private function findAutoGc(?string $ip, string|false $board, bool $get_mod_info, bool $require_ban_view, ?int $ban_id): array { + static private function findAutoGc(?string $ip, $board, bool $get_mod_info, bool $require_ban_view, ?int $ban_id): array { $query = prepare('SELECT ``bans``.*' . ($get_mod_info ? ', `username`' : '') . ' FROM ``bans`` ' . ($get_mod_info ? 'LEFT JOIN ``mods`` ON ``mods``.`id` = `creator`' : '') . ' WHERE From 0a870ebdb34d22205a3f61b37db8e8d077acaaa5 Mon Sep 17 00:00:00 2001 From: Lorenzo Yario Date: Sun, 22 Dec 2024 15:05:16 -0600 Subject: [PATCH 7/8] 7.4 --- inc/bans.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/bans.php b/inc/bans.php index 77b8e7f1..5f78e54d 100644 --- a/inc/bans.php +++ b/inc/bans.php @@ -130,7 +130,7 @@ class Bans { return $ban_list; } - static private function findNoGc(?string $ip, string|false $board, bool $get_mod_info, ?int $ban_id): array { + static private function findNoGc(?string $ip, string $board, bool $get_mod_info, ?int $ban_id): array { $query = prepare('SELECT ``bans``.*' . ($get_mod_info ? ', `username`' : '') . ' FROM ``bans`` ' . ($get_mod_info ? 'LEFT JOIN ``mods`` ON ``mods``.`id` = `creator`' : '') . ' WHERE @@ -276,7 +276,7 @@ class Bans { } } - static public function find(?string $ip, string|false $board = false, bool $get_mod_info = false, ?int $ban_id = null, bool $auto_gc = true) { + static public function find(?string $ip, string $board = false, bool $get_mod_info = false, ?int $ban_id = null, bool $auto_gc = true) { global $config; if ($auto_gc) { From 0f8a5fa926ce2f85da9a8e1b2a6728fa3fd1f741 Mon Sep 17 00:00:00 2001 From: Lorenzo Yario Date: Sun, 22 Dec 2024 15:17:22 -0600 Subject: [PATCH 8/8] continued 7.4 compatibility --- inc/bans.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/bans.php b/inc/bans.php index 5f78e54d..b09abda1 100644 --- a/inc/bans.php +++ b/inc/bans.php @@ -276,7 +276,7 @@ class Bans { } } - static public function find(?string $ip, string $board = false, bool $get_mod_info = false, ?int $ban_id = null, bool $auto_gc = true) { + static public function find(?string $ip, $board = false, bool $get_mod_info = false, ?int $ban_id = null, bool $auto_gc = true) { global $config; if ($auto_gc) {