Merge pull request #9507 from MrPetovan/bug/9480-never-mention-yourself

Never mention yourself

diff --git a/tests/functional/DependencyCheckTest.php b/tests/functional/DependencyCheckTest.php
index fcd3ca521faeb249b8a4f0f49cce67c4607066b9..74801f7c0f0278dad465e4c021d5aa1167590412 100644 (file)
--- a/tests/functional/DependencyCheckTest.php
+++ b/tests/functional/DependencyCheckTest.php
@@ -115,16 +115,17 @@ class DependencyCheckTest extends TestCase
 
        public function testDatabase()
        {
-               $configCache = $this->dice->create(Cache::class);
-               $configCache->set('database', 'disable_pdo', true);
+               // PDO needs to be disabled for PHP 7.2, see https://jira.mariadb.org/browse/MDEV-24121
+               if (version_compare(PHP_VERSION, '7.3') < 0) {
+                       $configCache = $this->dice->create(Cache::class);
+                       $configCache->set('database', 'disable_pdo', true);
+               }
 
                /** @var Database $database */
                $database = $this->dice->create(Database::class);
 
-               $database->setTestmode(true);
-
                self::assertInstanceOf(Database::class, $database);
-               self::assertContains($database->getDriver(), [Database::MYSQLI], 'The driver returns an unexpected value');
+               self::assertContains($database->getDriver(), [Database::PDO, Database::MYSQLI], 'The driver returns an unexpected value');
                self::assertNotNull($database->getConnection(), 'There is no database connection');
 
                $result = $database->p("SELECT 1");
@@ -136,8 +137,11 @@ class DependencyCheckTest extends TestCase
 
        public function testAppMode()
        {
-               $configCache = $this->dice->create(Cache::class);
-               $configCache->set('database', 'disable_pdo', true);
+               // PDO needs to be disabled for PHP 7.2, see https://jira.mariadb.org/browse/MDEV-24121
+               if (version_compare(PHP_VERSION, '7.3') < 0) {
+                       $configCache = $this->dice->create(Cache::class);
+                       $configCache->set('database', 'disable_pdo', true);
+               }
 
                /** @var App\Mode $mode */
                $mode = $this->dice->create(App\Mode::class);