From 31a507cd4ab9073ecb9617b2048031335ffb0174 Mon Sep 17 00:00:00 2001
From: Taras Machyshyn <taras@espocrm.com>
Date: Fri, 8 Apr 2022 16:28:12 +0300
Subject: [PATCH] Autoload fixes

---
 application/Espo/Core/Utils/Autoload/NamespaceLoader.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/application/Espo/Core/Utils/Autoload/NamespaceLoader.php b/application/Espo/Core/Utils/Autoload/NamespaceLoader.php
index e653a9e285..fb8036e9e0 100644
--- a/application/Espo/Core/Utils/Autoload/NamespaceLoader.php
+++ b/application/Espo/Core/Utils/Autoload/NamespaceLoader.php
@@ -214,9 +214,14 @@ class NamespaceLoader
 
             foreach ($itemData as $prefix => $path) {
                 if (!$skipVendorNamespaces) {
-                    $vendorNamespaces = $this->getVendorNamespaces($path);
+                    $vendorPaths = is_array($path) ? $path : (array) $path;
 
-                    $this->addListToClassLoader($vendorNamespaces, true);
+                    foreach ($vendorPaths as $vendorPath) {
+                        $this->addListToClassLoader(
+                            $this->getVendorNamespaces($vendorPath),
+                            true
+                        );
+                    }
                 }
 
                 if ($this->hasNamespace($type, $prefix)) {