feat(module): Improve module app config loader

Improve 'metadata/config' and 'view/config'. Changed: - Ensure extra paths are defined before merging. - Add support for extra module paths to 'translator/config'.
charcoalphp · Mar 6, 2024 · 8871115 · 8871115
1 parent e6c3493
commit 8871115
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 10 deletions.
diff --git a/packages/core/src/Charcoal/Model/ServiceProvider/ModelServiceProvider.php b/packages/core/src/Charcoal/Model/ServiceProvider/ModelServiceProvider.php
@@ -238,10 +238,12 @@ protected function registerMetadataDependencies(Container $container)
                             $configPath = $basePath . DIRECTORY_SEPARATOR . $configPath;
 
                             $configData = $metaConfig->loadFile($configPath);
-                            $extraPaths = array_merge(
-                                $extraPaths,
-                                $configData['metadata']['paths']
-                            );
+                            if (isset($configData['metadata']['paths'])) {
+                                $extraPaths = array_merge(
+                                    $extraPaths,
+                                    $configData['metadata']['paths']
+                                );
+                            }
                         };
                     }
 

diff --git a/packages/translator/src/Charcoal/Translator/ServiceProvider/TranslatorServiceProvider.php b/packages/translator/src/Charcoal/Translator/ServiceProvider/TranslatorServiceProvider.php
@@ -185,10 +185,38 @@ private function registerTranslator(Container $container)
         $container['translator/config'] = function (Container $container) {
             $appConfig   = isset($container['config']) ? $container['config'] : [];
             $transConfig = isset($appConfig['translator']) ? $appConfig['translator'] : null;
+
             if (isset($transConfig['paths'])) {
-                $transConfig['paths'] = $container['config']->resolveValues($transConfig['paths']);
+                $transConfig['paths'] = $appConfig->resolveValues($transConfig['paths']);
+            }
+
+            $transConfig = new TranslatorConfig($transConfig);
+
+            if (isset($container['module/classes'])) {
+                $extraPaths = [];
+                $basePath   = $appConfig['base_path'];
+                $modules    = $container['module/classes'];
+                foreach ($modules as $module) {
+                    if (defined(sprintf('%s::APP_CONFIG', $module))) {
+                        $configPath = ltrim($module::APP_CONFIG, '/');
+                        $configPath = $basePath . DIRECTORY_SEPARATOR . $configPath;
+
+                        $configData = $appConfig->loadFile($configPath);
+                        if (isset($configData['translator']['paths'])) {
+                            $extraPaths = array_merge(
+                                $extraPaths,
+                                $appConfig->resolveValues($configData['translator']['paths'])
+                            );
+                        }
+                    };
+                }
+
+                if ($extraPaths) {
+                    $transConfig->addPaths($extraPaths);
+                }
             }
-            return new TranslatorConfig($transConfig);
+
+            return $transConfig;
         };
 
         /**

diff --git a/packages/view/src/Charcoal/View/ViewServiceProvider.php b/packages/view/src/Charcoal/View/ViewServiceProvider.php
@@ -94,10 +94,12 @@ protected function registerViewConfig(Container $container): void
                         $configPath = $basePath . DIRECTORY_SEPARATOR . $configPath;
 
                         $configData = $viewConfig->loadFile($configPath);
-                        $extraPaths = array_merge(
-                            $extraPaths,
-                            $configData['view']['paths']
-                        );
+                        if (isset($configData['view']['paths'])) {
+                            $extraPaths = array_merge(
+                                $extraPaths,
+                                $configData['view']['paths']
+                            );
+                        }
                     };
                 }