rixty
/
AzuraCast
mirror of https://github.com/AzuraCast/AzuraCast.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes #5358 -- Provide all DB settings in all cases.

This commit is contained in:
Buster "Silver Eagle" Neece 2022-05-07 16:00:56 -05:00
parent 54f6298403
commit de86d23361
No known key found for this signature in database
GPG Key ID: 9FC8B9E008872109
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/services.php
View File

@ -73,8 +73,13 @@ return [
App\Doctrine\Event\SetExplicitChangeTracking $eventChangeTracking,
Psr\EventDispatcher\EventDispatcherInterface $dispatcher
) {
$dbSettings = $environment->getDatabaseSettings();
if (isset($dbSettings['unix_socket'])) {
unset($dbSettings['host'], $dbSettings['port']);
}
$connectionOptions = array_merge(
$environment->getDatabaseSettings(),
$dbSettings,
[
'driver' => 'pdo_mysql',
'charset' => 'utf8mb4',

11
src/Enums/SupportedLocales.php
View File

@ -67,10 +67,13 @@ enum SupportedLocales: string
public function register(Environment $environment): void
{
$translator = Loader::getInstance();
$translator->setlocale($this->value);
$translator->textdomain('default');
$translator->bindtextdomain('default', $environment->getBaseDirectory() . '/resources/locale');
// Skip translation file reading for default locale.
if ($this !== self::default()) {
$translator = Loader::getInstance();
$translator->setlocale($this->value);
$translator->textdomain('default');
$translator->bindtextdomain('default', $environment->getBaseDirectory() . '/resources/locale');
}
Loader::loadFunctions();
}

8
src/Environment.php
View File

@ -287,17 +287,15 @@ class Environment
public function getDatabaseSettings(): array
{
$dbSettings = [
'host' => $this->data[self::DB_HOST] ?? 'localhost',
'port' => (int)($this->data[self::DB_PORT] ?? 3306),
'dbname' => $this->data[self::DB_NAME] ?? 'azuracast',
'user' => $this->data[self::DB_USER] ?? 'azuracast',
'password' => $this->data[self::DB_PASSWORD] ?? 'azur4c457',
];
$host = $this->data[self::DB_HOST] ?? 'localhost';
if ('localhost' === $host) {
if ('localhost' === $dbSettings['host']) {
$dbSettings['unix_socket'] = '/run/mysqld/mysqld.sock';
} else {
$dbSettings['host'] = $host;
$dbSettings['port'] = (int)($this->data[self::DB_PORT] ?? 3306);
}
return $dbSettings;