diff --git a/application/Espo/Tools/EntityManager/EntityManager.php b/application/Espo/Tools/EntityManager/EntityManager.php index dcb080c678..d753702637 100644 --- a/application/Espo/Tools/EntityManager/EntityManager.php +++ b/application/Espo/Tools/EntityManager/EntityManager.php @@ -1688,12 +1688,19 @@ class EntityManager { $templateType = $this->metadata->get(['scopes', $entityType, 'type']); - /** @var array> $params */ - $params = [ - ...($this->metadata->get(['app', 'entityManagerParams', 'Global']) ?? []), - ...($this->metadata->get(['app', 'entityManagerParams', '@' . ($templateType ?? '_')]) ?? []), - ...($this->metadata->get(['app', 'entityManagerParams', $entityType]) ?? []), - ]; + $map1 = $this->metadata->get(['app', 'entityManagerParams', 'Global']) ?? []; + $map2 = $this->metadata->get(['app', 'entityManagerParams', '@' . ($templateType ?? '_')]) ?? []; + $map3 = $this->metadata->get(['app', 'entityManagerParams', $entityType]) ?? []; + + if (version_compare(PHP_VERSION, '8.1.0') < 0) { + // @todo Remove. + /** @var array> $params */ + $params = array_merge($map1, $map2, $map3); + } + else { + /** @var array> $params */ + $params = [...$map1, ...$map2, ...$map3]; + } $result = []; diff --git a/package-lock.json b/package-lock.json index 1ff030718a..4e1bfd82b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "espocrm", - "version": "7.5.1", + "version": "7.5.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "espocrm", - "version": "7.5.1", + "version": "7.5.2", "hasInstallScript": true, "license": "GPL-3.0", "dependencies": { diff --git a/package.json b/package.json index 9bd3c39b84..a63b3b3a74 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "espocrm", - "version": "7.5.1", + "version": "7.5.2", "description": "Open-source CRM.", "repository": { "type": "git",