From 9b064cdcceaaab71f5c4f447a6da6fa677a9b6ec Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 29 Apr 2022 18:01:59 +0200 Subject: [PATCH] more php8.1 compatibility Signed-off-by: Michael Kaufmann --- lib/Froxlor/Cron/TaskId.php | 2 +- lib/Froxlor/Database/Manager/DbManagerMySQL.php | 2 +- tests/Cron/TaskIdTest.php | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/Froxlor/Cron/TaskId.php b/lib/Froxlor/Cron/TaskId.php index 4d388ce2..d80e6c11 100644 --- a/lib/Froxlor/Cron/TaskId.php +++ b/lib/Froxlor/Cron/TaskId.php @@ -27,7 +27,7 @@ namespace Froxlor\Cron; use ReflectionClass; -class TaskId +final class TaskId { /** * TYPE=1 MEANS TO REBUILD APACHE VHOSTS.CONF diff --git a/lib/Froxlor/Database/Manager/DbManagerMySQL.php b/lib/Froxlor/Database/Manager/DbManagerMySQL.php index aff227fc..4808e4b5 100644 --- a/lib/Froxlor/Database/Manager/DbManagerMySQL.php +++ b/lib/Froxlor/Database/Manager/DbManagerMySQL.php @@ -138,7 +138,7 @@ class DbManagerMySQL */ public function deleteDatabase($dbname = null) { - if (Database::getAttribute(PDO::ATTR_SERVER_VERSION) < '5.0.2') { + if (version_compare(Database::getAttribute(PDO::ATTR_SERVER_VERSION), '5.0.2', '<')) { // failsafe if user has been deleted manually (requires MySQL 4.1.2+) $stmt = Database::prepare("REVOKE ALL PRIVILEGES, GRANT OPTION FROM `" . $dbname . "`"); Database::pexecute($stmt, [], false); diff --git a/tests/Cron/TaskIdTest.php b/tests/Cron/TaskIdTest.php index 21e7b6a1..9b24eeec 100644 --- a/tests/Cron/TaskIdTest.php +++ b/tests/Cron/TaskIdTest.php @@ -46,9 +46,6 @@ class TaskIDTest extends TestCase $isNegativeValid = TaskId::isValid(-1); $this->assertFalse($isNegativeValid, "Negative task should be invalid"); - - $isTESTTASKValid = TaskIdExtended::isValid(10101010); - $this->assertTrue($isTESTTASKValid); } public function testIdMappingCorrect() { @@ -68,7 +65,3 @@ class TaskIDTest extends TestCase $this->assertFalse($unknownIDResult); } } - -class TaskIdExtended extends TaskId { - const TESTTASK = 10101010; -}