From 126395fe289c23ca551fcce96a0614183f01a4a2 Mon Sep 17 00:00:00 2001 From: catch <catch@35733.no-reply.drupal.org> Date: Mon, 10 Jul 2023 18:13:14 +0100 Subject: [PATCH] Issue #3371992 by andypost, daffie: Tests should check sqlite version using PDO_sqlite extension --- .../Drupal/BuildTests/Framework/Tests/HtRouterTest.php | 3 ++- core/tests/Drupal/Tests/Core/Command/GenerateThemeTest.php | 3 ++- core/tests/Drupal/Tests/Core/Command/QuickStartTest.php | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/core/tests/Drupal/BuildTests/Framework/Tests/HtRouterTest.php b/core/tests/Drupal/BuildTests/Framework/Tests/HtRouterTest.php index 721766587f36..9e90a19270e0 100644 --- a/core/tests/Drupal/BuildTests/Framework/Tests/HtRouterTest.php +++ b/core/tests/Drupal/BuildTests/Framework/Tests/HtRouterTest.php @@ -16,7 +16,8 @@ class HtRouterTest extends QuickStartTestBase { * @covers ::instantiateServer */ public function testHtRouter() { - if (version_compare(\SQLite3::version()['versionString'], Tasks::SQLITE_MINIMUM_VERSION) < 0) { + $sqlite = (new \PDO('sqlite::memory:'))->query('select sqlite_version()')->fetch()[0]; + if (version_compare($sqlite, Tasks::SQLITE_MINIMUM_VERSION) < 0) { $this->markTestSkipped(); } diff --git a/core/tests/Drupal/Tests/Core/Command/GenerateThemeTest.php b/core/tests/Drupal/Tests/Core/Command/GenerateThemeTest.php index 60c4431cf680..a64881c051c5 100644 --- a/core/tests/Drupal/Tests/Core/Command/GenerateThemeTest.php +++ b/core/tests/Drupal/Tests/Core/Command/GenerateThemeTest.php @@ -28,7 +28,8 @@ class GenerateThemeTest extends QuickStartTestBase { * {@inheritdoc} */ protected function setUp(): void { - if (version_compare(\SQLite3::version()['versionString'], Tasks::SQLITE_MINIMUM_VERSION) < 0) { + $sqlite = (new \PDO('sqlite::memory:'))->query('select sqlite_version()')->fetch()[0]; + if (version_compare($sqlite, Tasks::SQLITE_MINIMUM_VERSION) < 0) { $this->markTestSkipped(); } parent::setUp(); diff --git a/core/tests/Drupal/Tests/Core/Command/QuickStartTest.php b/core/tests/Drupal/Tests/Core/Command/QuickStartTest.php index bcce6a91a4f4..536a67398f1d 100644 --- a/core/tests/Drupal/Tests/Core/Command/QuickStartTest.php +++ b/core/tests/Drupal/Tests/Core/Command/QuickStartTest.php @@ -85,7 +85,8 @@ protected function tearDown(): void { * Tests the quick-start command. */ public function testQuickStartCommand() { - if (version_compare(\SQLite3::version()['versionString'], Tasks::SQLITE_MINIMUM_VERSION) < 0) { + $sqlite = (new \PDO('sqlite::memory:'))->query('select sqlite_version()')->fetch()[0]; + if (version_compare($sqlite, Tasks::SQLITE_MINIMUM_VERSION) < 0) { $this->markTestSkipped(); } @@ -140,7 +141,8 @@ public function testQuickStartCommand() { * Tests the quick-start commands. */ public function testQuickStartInstallAndServerCommands() { - if (version_compare(\SQLite3::version()['versionString'], Tasks::SQLITE_MINIMUM_VERSION) < 0) { + $sqlite = (new \PDO('sqlite::memory:'))->query('select sqlite_version()')->fetch()[0]; + if (version_compare($sqlite, Tasks::SQLITE_MINIMUM_VERSION) < 0) { $this->markTestSkipped(); } -- GitLab