xle/tt-rss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bump minimum required php version to 8.0 & remove some deprecated code

Browse Source
This commit is contained in:
Andrew Dolgov
2024-11-23 15:54:40 +03:00
parent 7be6484fee
commit 648024eb2e
4 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
classes/Config.php
View File

@@ -534,8 +534,8 @@ class Config {
array_push($errors, "Please don't run this script as root."); array_push($errors, "Please don't run this script as root.");
} }
if (version_compare(PHP_VERSION, '7.4.0', '<')) { if (version_compare(PHP_VERSION, '8.0.0', '<')) {
array_push($errors, "PHP version 7.4.0 or newer required. You're using " . PHP_VERSION . "."); array_push($errors, "PHP version 8.0.0 or newer required. You're using " . PHP_VERSION . ".");
} }
if (!class_exists("UConverter")) { if (!class_exists("UConverter")) {

8
classes/OPML.php
View File

@@ -647,16 +647,8 @@ class OPML extends Handler_Protected {
$doc = new DOMDocument(); $doc = new DOMDocument();
if (version_compare(PHP_VERSION, '8.0.0', '<')) {
libxml_disable_entity_loader(false);
}
$loaded = $doc->load($tmp_file); $loaded = $doc->load($tmp_file);
if (version_compare(PHP_VERSION, '8.0.0', '<')) {
libxml_disable_entity_loader(true);
}
// only remove temporary i.e. HTTP uploaded files // only remove temporary i.e. HTTP uploaded files
if (!$filename) if (!$filename)
unlink($tmp_file); unlink($tmp_file);

8
include/errorhandler.php
View File

@@ -41,12 +41,8 @@ function format_backtrace(array $trace): string {
} }
function ttrss_error_handler(int $errno, string $errstr, string $file, int $line): bool { function ttrss_error_handler(int $errno, string $errstr, string $file, int $line): bool {
// return true in order to avoid default error handling by PHP // return true in order to avoid default error handling by PHP
if (version_compare(PHP_VERSION, '8.0.0', '<')) { if (!(error_reporting() & $errno)) return true;
if (error_reporting() == 0 || !$errno) return true;
} else {
if (!(error_reporting() & $errno)) return true;
}
$file = substr(str_replace(dirname(__DIR__), "", $file), 1); $file = substr(str_replace(dirname(__DIR__), "", $file), 1);

4
include/functions.php
View File

@@ -5,10 +5,6 @@
/** @deprecated by Config::SCHEMA_VERSION */ /** @deprecated by Config::SCHEMA_VERSION */
define('SCHEMA_VERSION', 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); libxml_use_internal_errors(true);
// separate test because this is included before sanity checks // separate test because this is included before sanity checks