Merge branch 'fix'

This commit is contained in:
Yuri Kuznetsov
2023-06-28 12:56:54 +03:00
3 changed files with 4 additions and 5 deletions
@@ -37,7 +37,6 @@ use RuntimeException;
class DatabaseParamsFactory
{
private const DEFAULT_PLATFORM = 'Mysql';
private const DEFAULT_CHARSET = 'utf8';
public function __construct(private Config $config) {}
@@ -55,7 +54,7 @@ class DatabaseParamsFactory
->withName($config->get('database.dbname'))
->withUsername($config->get('database.user'))
->withPassword($config->get('database.password'))
->withCharset($config->get('database.charset') ?? self::DEFAULT_CHARSET)
->withCharset($config->get('database.charset'))
->withPlatform($config->get('database.platform'))
->withSslCa($config->get('database.sslCA'))
->withSslCert($config->get('database.sslCert'))
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "espocrm",
"version": "7.5.4",
"version": "7.5.5",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "espocrm",
"version": "7.5.4",
"version": "7.5.5",
"hasInstallScript": true,
"license": "GPL-3.0",
"dependencies": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "espocrm",
"version": "7.5.4",
"version": "7.5.5",
"description": "Open-source CRM.",
"repository": {
"type": "git",