From b05b68d481e0b4b2c877495c4f388322fc811580 Mon Sep 17 00:00:00 2001
From: Divesh Pahuja <divesh.pahuja@pimcore.com>
Date: Wed, 2 Aug 2023 18:04:11 +0200
Subject: [PATCH] small optimizations

---
 src/Configuration/DatahubConfigLocator.php          | 13 ++++---------
 src/DependencyInjection/PimcoreDataHubExtension.php |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/Configuration/DatahubConfigLocator.php b/src/Configuration/DatahubConfigLocator.php
index b6d84d07..40a089d7 100644
--- a/src/Configuration/DatahubConfigLocator.php
+++ b/src/Configuration/DatahubConfigLocator.php
@@ -39,21 +39,16 @@ public function locate(string $name, $params = [])
         $dirs = [];
         $finder = new Finder();
 
-        if (is_dir(Dao::CONFIG_PATH)) {
-            array_push($dirs, Dao::CONFIG_PATH);
+        $defaultConfigDir = $params['defaultConfigDir'] ?? '';
+        if (is_dir($defaultConfigDir)) {
+            array_push($dirs, $defaultConfigDir);
         }
 
         $confDir = (string) ($_SERVER['PIMCORE_CONFIG_STORAGE_DIR_DATA_HUB'] ?? '');
-        if (!empty($confDir)) {
+        if (is_dir($confDir)) {
             $dirs = [... $dirs, $confDir];
         }
 
-        $symfonyConf = \Pimcore::getContainer()->getParameter('pimcore_data_hub');
-        $symfonyConfDir = $symfonyConf['config_location']['data_hub']['write_target']['options']['directory'];
-        if (!empty($symfonyConfDir)) {
-            $dirs = [... $dirs, $symfonyConfDir];
-        }
-
         if (empty($dirs)) {
             return [];
         }
diff --git a/src/DependencyInjection/PimcoreDataHubExtension.php b/src/DependencyInjection/PimcoreDataHubExtension.php
index f58f33f3..261ca549 100644
--- a/src/DependencyInjection/PimcoreDataHubExtension.php
+++ b/src/DependencyInjection/PimcoreDataHubExtension.php
@@ -72,7 +72,7 @@ public function prepend(ContainerBuilder $container)
             }
         } else {
             $configLocator = new \Pimcore\Bundle\DataHubBundle\Configuration\DatahubConfigLocator();
-            foreach ($configLocator->locate('config') as $config) {
+            foreach ($configLocator->locate('config', ['defaultConfigDir' => $configDir]) as $config) {
                 $configLoader->load($config);
             }
         }