clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9506 from annando/test-mysql-no-pdo 

Only disable PDO in tests for versions lower than 7.3
This commit is contained in:
Hypolite Petovan 2020-11-08 13:55:53 -05:00 committed by GitHub
parent f4da50063a 97bddc25af
commit c92a333b17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/functional/DependencyCheckTest.php
View File

@ -115,16 +115,17 @@ class DependencyCheckTest extends TestCase
public function testDatabase() public function testDatabase()
{ {
$configCache = $this->dice->create(Cache::class); // PDO needs to be disabled for PHP 7.2, see https://jira.mariadb.org/browse/MDEV-24121
$configCache->set('database', 'disable_pdo', true); if (version_compare(PHP_VERSION, '7.3') < 0) {
$configCache = $this->dice->create(Cache::class);
$configCache->set('database', 'disable_pdo', true);
}
/** @var Database $database */ /** @var Database $database */
$database = $this->dice->create(Database::class); $database = $this->dice->create(Database::class);
$database->setTestmode(true);
self::assertInstanceOf(Database::class, $database); 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'); self::assertNotNull($database->getConnection(), 'There is no database connection');
$result = $database->p("SELECT 1"); $result = $database->p("SELECT 1");
@ -136,8 +137,11 @@ class DependencyCheckTest extends TestCase
public function testAppMode() public function testAppMode()
{ {
$configCache = $this->dice->create(Cache::class); // PDO needs to be disabled for PHP 7.2, see https://jira.mariadb.org/browse/MDEV-24121
$configCache->set('database', 'disable_pdo', true); if (version_compare(PHP_VERSION, '7.3') < 0) {
$configCache = $this->dice->create(Cache::class);
$configCache->set('database', 'disable_pdo', true);
}
/** @var App\Mode $mode */ /** @var App\Mode $mode */
$mode = $this->dice->create(App\Mode::class); $mode = $this->dice->create(App\Mode::class);