Mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2026-03-10 09:13:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactored Language and UrlShortener config customizers

Browse Source
This commit is contained in:
Alejandro Celaya
2018-10-03 18:55:20 +02:00
parent d5736756f7
commit 1b5081ae21
3 changed files with 78 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/Installer/src/Model/CustomizableAppConfig.php
View File

@@ -117,7 +117,7 @@ final class CustomizableAppConfig implements ArraySerializableInterface
'DISABLE_TRACK_PARAM' => $array['app_options']['disable_track_param'] ?? null,
]);
$this->deserializeDatabase($array['entity_manager']['connection'] ?? []);
$this->setDatabase($this->deserializeDatabase($array['entity_manager']['connection'] ?? []));
$this->setLanguage([
'DEFAULT' => $array['translator']['locale'] ?? null,
@@ -132,10 +132,10 @@ final class CustomizableAppConfig implements ArraySerializableInterface
]);
}
private function deserializeDatabase(array $conn): void
private function deserializeDatabase(array $conn): array
{
if (! isset($conn['driver'])) {
return;
return [];
}
$driver = $conn['driver'];
@@ -148,7 +148,7 @@ final class CustomizableAppConfig implements ArraySerializableInterface
$params['PORT'] = $conn['port'] ?? null;
}
$this->setDatabase($params);
return $params;
}
public function getArrayCopy(): array