From 7a5aaf31e4f48a08b1656a6133a23b90cef32656 Mon Sep 17 00:00:00 2001
From: Bernhard Rusch <brusch@users.noreply.github.com>
Date: Thu, 7 Dec 2023 14:48:02 +0100
Subject: [PATCH] [Data Objects] Fixed breaking change caused by
 pimcore/pimcore#14454 - it introduced a requirement on the settings-store
 when building the PHP classes of class definitions (#19)

---
 bundles/CoreBundle/config/pimcore/default.yaml           | 5 +++++
 .../CoreBundle/src/DependencyInjection/Configuration.php | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/bundles/CoreBundle/config/pimcore/default.yaml b/bundles/CoreBundle/config/pimcore/default.yaml
index 1310e7ed7ea..60c5046e21a 100644
--- a/bundles/CoreBundle/config/pimcore/default.yaml
+++ b/bundles/CoreBundle/config/pimcore/default.yaml
@@ -329,3 +329,8 @@ pimcore:
 
     gotenberg:
         base_url: 'http://gotenberg:3000'
+
+    config_location:
+        select_options:
+            read_target:
+                type: 'symfony-config'
diff --git a/bundles/CoreBundle/src/DependencyInjection/Configuration.php b/bundles/CoreBundle/src/DependencyInjection/Configuration.php
index 016230e0e01..10f1b7ff1c6 100644
--- a/bundles/CoreBundle/src/DependencyInjection/Configuration.php
+++ b/bundles/CoreBundle/src/DependencyInjection/Configuration.php
@@ -138,8 +138,6 @@ public function getConfigTreeBuilder(): TreeBuilder
             'perspectives' => PIMCORE_CONFIGURATION_DIRECTORY . '/perspectives',
             'custom_views' => PIMCORE_CONFIGURATION_DIRECTORY . '/custom_views',
             'object_custom_layouts' => PIMCORE_CONFIGURATION_DIRECTORY . '/object_custom_layouts',
-            'system_settings' => PIMCORE_CONFIGURATION_DIRECTORY . '/system_settings',
-            'select_options' => PIMCORE_CONFIGURATION_DIRECTORY . '/select_options',
         ]);
 
         ConfigurationHelper::addConfigLocationTargetNode(
@@ -149,6 +147,13 @@ public function getConfigTreeBuilder(): TreeBuilder
             [LocationAwareConfigRepository::READ_TARGET]
         );
 
+        ConfigurationHelper::addConfigLocationTargetNode(
+            $storageNode,
+            'select_options',
+            PIMCORE_CONFIGURATION_DIRECTORY . '/select_options',
+            [LocationAwareConfigRepository::READ_TARGET]
+        );
+
         return $treeBuilder;
     }