Skip to content

Allow extending upon MySQL client extra configuration #40410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jissereitsma wants to merge 3 commits into
base: 2.4-develop
Choose a base branch
from
Open

Allow extending upon MySQL client extra configuration #40410

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37ebc6b
Allow extending upon MySQL client extra configuration
jissereitsma Jan 7, 2026
8891988
Fix file check
jissereitsma Jan 8, 2026
0c868a0
Merge branch '2.4-develop' into patch-2
jissereitsma Jan 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 28 additions & 9 deletions dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,16 +220,35 @@ public function getVendorName()
*/
private function ensureDefaultsExtraFile()
{
if (!file_exists($this->_defaultsExtraFile)) {
$this->assertVarPathWritable();
$extraConfig = [
'[client]',
'user=' . $this->_user,
'password="' . $this->_password . '"'
];
file_put_contents($this->_defaultsExtraFile, implode(PHP_EOL, $extraConfig));
chmod($this->_defaultsExtraFile, 0640);
if (file_exists($this->_defaultsExtraFile)) {
return;
}

$this->assertVarPathWritable();

$config = [
'client' => [
'user='.$this->_user,
'password="'.$this->_password.'"',
],
];

$additionalFile = dirname(dirname($this->_varPath)).'/etc/mysql-client-config.php';
if (file_exists($additionalFile)) {
$config = array_merge($config, (array)include $additionalFile);
}

$ini = '';
foreach ($config as $section => $values) {
$ini .= "[$section]".PHP_EOL;
foreach ($values as $value) {
$ini .= $value.PHP_EOL;
}
$ini .= PHP_EOL;
}

file_put_contents($this->_defaultsExtraFile, $ini);
chmod($this->_defaultsExtraFile, 0640);
}

/**
Expand Down