maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

more php8.1 compatibility

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-04-29 18:01:59 +02:00
parent 3065b5fbf9
commit 9b064cdcce
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Froxlor/Cron/TaskId.php
View File

@@ -27,7 +27,7 @@ namespace Froxlor\Cron;
use ReflectionClass; use ReflectionClass;
class TaskId final class TaskId
{ {
/** /**
* TYPE=1 MEANS TO REBUILD APACHE VHOSTS.CONF * TYPE=1 MEANS TO REBUILD APACHE VHOSTS.CONF

2
lib/Froxlor/Database/Manager/DbManagerMySQL.php
View File

@@ -138,7 +138,7 @@ class DbManagerMySQL
*/ */
public function deleteDatabase($dbname = null) 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+) // failsafe if user has been deleted manually (requires MySQL 4.1.2+)
$stmt = Database::prepare("REVOKE ALL PRIVILEGES, GRANT OPTION FROM `" . $dbname . "`"); $stmt = Database::prepare("REVOKE ALL PRIVILEGES, GRANT OPTION FROM `" . $dbname . "`");
Database::pexecute($stmt, [], false); Database::pexecute($stmt, [], false);

7
tests/Cron/TaskIdTest.php
View File

@@ -46,9 +46,6 @@ class TaskIDTest extends TestCase
$isNegativeValid = TaskId::isValid(-1); $isNegativeValid = TaskId::isValid(-1);
$this->assertFalse($isNegativeValid, "Negative task should be invalid"); $this->assertFalse($isNegativeValid, "Negative task should be invalid");
$isTESTTASKValid = TaskIdExtended::isValid(10101010);
$this->assertTrue($isTESTTASKValid);
} }
public function testIdMappingCorrect() { public function testIdMappingCorrect() {
@@ -68,7 +65,3 @@ class TaskIDTest extends TestCase
$this->assertFalse($unknownIDResult); $this->assertFalse($unknownIDResult);
} }
} }
class TaskIdExtended extends TaskId {
const TESTTASK = 10101010;
}