fix entity manager

sokogfb · Jun 19, 2023 · 1ad2656 · 1ad2656
1 parent 04906c5
commit 1ad2656
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/application/Espo/Tools/EntityManager/EntityManager.php b/application/Espo/Tools/EntityManager/EntityManager.php
@@ -1688,12 +1688,19 @@ private function getAdditionalParamLocationMap(string $entityType): array
     {
         $templateType = $this->metadata->get(['scopes', $entityType, 'type']);
 
-        /** @var array<string, array<string, mixed>> $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<string, array<string, mixed>> $params */
+            $params = array_merge($map1, $map2, $map3);
+        }
+        else {
+            /** @var array<string, array<string, mixed>> $params */
+            $params = [...$map1, ...$map2, ...$map3];
+        }
 
         $result = [];