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

4 files changed, 4 insertions, 20 deletions

diff --git a/classes/Config.php b/classes/Config.php
index 9235e2c45..ba6689214 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -534,8 +534,8 @@ class Config {
 				array_push($errors, "Please don't run this script as root.");
 			}
 
-			if (version_compare(PHP_VERSION, '7.4.0', '<')) {
-				array_push($errors, "PHP version 7.4.0 or newer required. You're using " . PHP_VERSION . ".");
+			if (version_compare(PHP_VERSION, '8.0.0', '<')) {
+				array_push($errors, "PHP version 8.0.0 or newer required. You're using " . PHP_VERSION . ".");
 			}
 
 			if (!class_exists("UConverter")) {
diff --git a/classes/OPML.php b/classes/OPML.php
index fce614a17..722312be6 100644
--- a/classes/OPML.php
+++ b/classes/OPML.php
@@ -647,16 +647,8 @@ class OPML extends Handler_Protected {
 
 		$doc = new DOMDocument();
 
-		if (version_compare(PHP_VERSION, '8.0.0', '<')) {
-			libxml_disable_entity_loader(false);
-		}
-
 		$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
 		if (!$filename)
 			unlink($tmp_file);
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