From 4487199f16ec9f65b6a5bfaf73dc9d73e2a4ae89 Mon Sep 17 00:00:00 2001 From: Markus Birth Date: Sat, 14 Jun 2025 17:58:36 +0100 Subject: [PATCH] Increase error reporting and fix a few small warnings Signed-off-by: Markus Birth --- include/functions_permalinks.inc.php | 2 +- include/functions_smarty.inc.php | 6 +++--- lib/LuckyCoin/ConfigContainer.php | 2 +- lib/LuckyCoin/Database/PdoSqliteDatabase.php | 5 ++++- lib/bootstrap.php | 2 +- serendipity_config.inc.php | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/functions_permalinks.inc.php b/include/functions_permalinks.inc.php index ec7c472b..f489bad1 100644 --- a/include/functions_permalinks.inc.php +++ b/include/functions_permalinks.inc.php @@ -843,7 +843,7 @@ function serendipity_getUriArguments($uri, $wildcard = false) { /* Explode the path into sections, to later be able to check for arguments and add our own */ preg_match('/^'. preg_quote($serendipity['serendipityHTTPPath'], '/') . '(' . preg_quote($serendipity['indexFile'], '/') . '\?\/)?(' . ($wildcard ? '.+' : '[!;,_a-z0-9\-*\/%\+]+') . ')/i', $uri, $_res); - if (strlen($_res[2] ?? null) != 0) { + if (strlen($_res[2] ?? '') != 0) { $args = explode('/', $_res[2]); if ($args[0] == $indexFile || $args[0] == $serendipity['indexFile']) { unset($args[0]); diff --git a/include/functions_smarty.inc.php b/include/functions_smarty.inc.php index 2d875e76..816e3b15 100644 --- a/include/functions_smarty.inc.php +++ b/include/functions_smarty.inc.php @@ -1026,8 +1026,8 @@ function serendipity_smarty_init($vars = array()) { $serendipity['smarty_vars']['head_link_stylesheet'] .= '&v=' . ($serendipity['last_template_change'] ?? null); $serendipity['smarty_vars']['head_link_stylesheet_frontend'] .= '&v=' . ($serendipity['last_template_change'] ?? null); } else { - $serendipity['smarty_vars']['head_link_stylesheet'] .= '?v=' . $serendipity['last_template_change']; - $serendipity['smarty_vars']['head_link_stylesheet_frontend'] .= '?v=' . $serendipity['last_template_change']; + $serendipity['smarty_vars']['head_link_stylesheet'] .= '?v=' . ($serendipity['last_template_change'] ?? ''); + $serendipity['smarty_vars']['head_link_stylesheet_frontend'] .= '?v=' . ($serendipity['last_template_change'] ?? ''); } } @@ -1041,7 +1041,7 @@ function serendipity_smarty_init($vars = array()) { if (strstr($serendipity['smarty_vars']['head_link_script'], '?')) { $serendipity['smarty_vars']['head_link_script'] .= '&v=' . ($serendipity['last_template_change'] ?? null); } else { - $serendipity['smarty_vars']['head_link_script'] .= '?v=' . $serendipity['last_template_change']; + $serendipity['smarty_vars']['head_link_script'] .= '?v=' . ($serendipity['last_template_change'] ?? ''); } } diff --git a/lib/LuckyCoin/ConfigContainer.php b/lib/LuckyCoin/ConfigContainer.php index d677b453..855f09ef 100644 --- a/lib/LuckyCoin/ConfigContainer.php +++ b/lib/LuckyCoin/ConfigContainer.php @@ -35,7 +35,7 @@ class ConfigContainer implements ArrayAccess return isset($this->serendipity[$offset]); } - public function offsetGet($offset) + public function offsetGet(mixed $offset): mixed { return isset($this->serendipity[$offset]) ? $this->serendipity[$offset] : null; } diff --git a/lib/LuckyCoin/Database/PdoSqliteDatabase.php b/lib/LuckyCoin/Database/PdoSqliteDatabase.php index 112151af..542ca56f 100644 --- a/lib/LuckyCoin/Database/PdoSqliteDatabase.php +++ b/lib/LuckyCoin/Database/PdoSqliteDatabase.php @@ -63,7 +63,10 @@ class PdoSqliteDatabase extends DbAbstract // To fix that, we use a preg-regex; but that is quite performance costy. // Either we always need to use 'SELECT a.id AS id, b.text AS text' in query, // or the sqlite extension may get fixed. :-) - $newrow[preg_replace('@^.+\.(.*)@', '\1', $i)] = str_replace($search, $replace, $v); + if (!is_null($v)) { + $v = str_replace($search, $replace, $v); + } + $newrow[preg_replace('@^.+\.(.*)@', '\1', $i)] = $v; } return $newrow; diff --git a/lib/bootstrap.php b/lib/bootstrap.php index c85e6e8f..1c595eed 100644 --- a/lib/bootstrap.php +++ b/lib/bootstrap.php @@ -6,7 +6,7 @@ namespace LuckyCoin; // FIXME: Remove when code makes sense again -error_reporting(E_ALL & ~E_NOTICE); +error_reporting(E_ALL & ~E_WARNING & ~E_NOTICE & ~E_DEPRECATED); // Ensure vendor libraries exist $autoload = __DIR__ . '/../vendor/autoload.php'; diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php index 47b2d936..f8db4528 100644 --- a/serendipity_config.inc.php +++ b/serendipity_config.inc.php @@ -29,7 +29,7 @@ if (!headers_sent() && php_sapi_name() !== 'cli') { session_regenerate_id(true); @session_start(); header('X-Session-Reinit: true'); - $_SESSION['SERVER_GENERATED_SID'] = $_SERVER['REMOTE_ADDR'] . $_SERVER['QUERY_STRING']; + $_SESSION['SERVER_GENERATED_SID'] = $_SERVER['REMOTE_ADDR'] . ($_SERVER['QUERY_STRING'] ?? ''); } }