Skip to content

Commit 065736e

Browse files
committed
AC-8402: Ensure compatibility with the latest MariaDB patch versions
1 parent fe12f0a commit 065736e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

dev/tests/setup-integration/framework/Magento/TestFramework/TestCase/SetupTestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ private function getDbKey(): string
110110
if ($this->sqlVersionProvider->isMysqlGte8029()) {
111111
$this->dbKey = DataProviderFromFile::POSSIBLE_SUFFIXES[SqlVersionProvider::MYSQL_8_0_29_VERSION];
112112
break;
113-
} elseif ($this->sqlVersionProvider->isMariaDBGte10_4_27()) {
113+
} elseif ($this->sqlVersionProvider->isMariaDBGte10427()) {
114114
$this->dbKey = DataProviderFromFile::POSSIBLE_SUFFIXES[SqlVersionProvider::MARIA_DB_10_4_27_VERSION];
115115
break;
116-
} elseif ($this->sqlVersionProvider->isMariaDBGte10_6_11()) {
116+
} elseif ($this->sqlVersionProvider->isMariaDBGte10611()) {
117117
$this->dbKey = DataProviderFromFile::POSSIBLE_SUFFIXES[SqlVersionProvider::MARIA_DB_10_6_11_VERSION];
118118
break;
119119
} elseif (strpos($this->getDatabaseVersion(), (string)$possibleVersion) !== false) {

lib/internal/Magento/Framework/DB/Adapter/SqlVersionProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public function isMysqlGte8029(): bool
150150
* @return bool
151151
* @throws ConnectionException
152152
*/
153-
public function isMariaDBGte10_6_11(): bool
153+
public function isMariaDBGte10611(): bool
154154
{
155155
$sqlVersion = $this->getSqlVersion();
156156
$isMariaDB = str_contains($sqlVersion, SqlVersionProvider::MARIA_DB_10_VERSION);
@@ -167,7 +167,7 @@ public function isMariaDBGte10_6_11(): bool
167167
* @return bool
168168
* @throws ConnectionException
169169
*/
170-
public function isMariaDBGte10_4_27(): bool
170+
public function isMariaDBGte10427(): bool
171171
{
172172
$sqlVersion = $this->getSqlVersion();
173173
$isMariaDB = str_contains($sqlVersion, SqlVersionProvider::MARIA_DB_10_VERSION);

0 commit comments

Comments
 (0)