aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Dolgov <fox@fakecake.org>2024-11-23 15:54:40 +0300
committerAndrew Dolgov <fox@fakecake.org>2024-11-23 15:54:40 +0300
commit648024eb2e760b787bfabc5c8e51fcf7e68c7eb1 (patch)
tree0fb8c543d3fef16e7da1c4b959b2354935c07e6d /include
parent7be6484fee9c262a30d329851e5c9f530a409aa8 (diff)
bump minimum required php version to 8.0 & remove some deprecated code
Diffstat (limited to 'include')
-rw-r--r--include/errorhandler.php8
-rw-r--r--include/functions.php4
2 files changed, 2 insertions, 10 deletions
diff --git a/include/errorhandler.php b/include/errorhandler.php
index 4f773bc19..c155c9989 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -41,12 +41,8 @@ function format_backtrace(array $trace): string {
}
function ttrss_error_handler(int $errno, string $errstr, string $file, int $line): bool {
- // return true in order to avoid default error handling by PHP
- if (version_compare(PHP_VERSION, '8.0.0', '<')) {
- if (error_reporting() == 0 || !$errno) return true;
- } else {
- if (!(error_reporting() & $errno)) return true;
- }
+ // return true in order to avoid default error handling by PHP
+ if (!(error_reporting() & $errno)) return true;
$file = substr(str_replace(dirname(__DIR__), "", $file), 1);
diff --git a/include/functions.php b/include/functions.php
index c77b68828..dcb37cb86 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -5,10 +5,6 @@
/** @deprecated by Config::SCHEMA_VERSION */
define('SCHEMA_VERSION', Config::SCHEMA_VERSION);
- if (version_compare(PHP_VERSION, '8.0.0', '<')) {
- libxml_disable_entity_loader(true);
- }
-
libxml_use_internal_errors(true);
// separate test because this is included before sanity checks