Merge pull request #385 from CPS-IT/task/1.x/view-parameter

[!!!][TASK] Streamline view configuration across path providers
CPS-IT · Jan 7, 2025 · e25b6fd · e25b6fd
2 parents fcf946e + 8b2c3da
commit e25b6fd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Classes/DependencyInjection/Extension/Configuration.php b/Classes/DependencyInjection/Extension/Configuration.php
@@ -34,7 +34,7 @@
  * - defaultData:
  *   - [data]: any default data passed to the renderer
  *
- * - template:
+ * - view:
  *   - [templateRootPaths]: numeric array of template root paths
  *   - [partialRootPaths]: numeric array of partial root paths
  *
@@ -57,7 +57,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->performNoDeepMerging()
                     ->variablePrototype()->end()
                 ->end()
-                ->arrayNode('template')
+                ->arrayNode('view')
                     ->children()
                         ->arrayNode('templateRootPaths')
                             ->beforeNormalization()

diff --git a/Classes/DependencyInjection/Extension/HandlebarsExtension.php b/Classes/DependencyInjection/Extension/HandlebarsExtension.php
@@ -75,8 +75,8 @@ public function load(array $configs, ContainerBuilder $container): void
      */
     private function parseConfiguration(array $configs): void
     {
-        $templateConfig = $this->mergeConfigs($configs, 'template');
         $this->defaultData = $this->mergeConfigs($configs, 'default_data');
+        $templateConfig = $this->mergeConfigs($configs, 'view');
         $this->templateRootPaths = $templateConfig['templateRootPaths'] ?? [];
         $this->partialRootPaths = $templateConfig['partialRootPaths'] ?? [];
     }

diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
@@ -28,6 +28,6 @@ services:
 
 handlebars:
   default_data: []
-  template:
+  view:
     templateRootPaths: []
     partialRootPaths: []
diff --git a/Documentation/Configuration/TemplatePaths/Index.rst b/Documentation/Configuration/TemplatePaths/Index.rst
@@ -27,7 +27,7 @@ is by using the :file:`Services.yaml` file:
     # Configuration/Services.yaml
 
     handlebars:
-      template:
+      view:
         templateRootPaths:
           10: EXT:my_extension/Resources/Private/Templates
         partialRootPaths:

diff --git a/Tests/Unit/DependencyInjection/Extension/HandlebarsExtensionTest.php b/Tests/Unit/DependencyInjection/Extension/HandlebarsExtensionTest.php
@@ -117,12 +117,12 @@ public static function loadAddsResolvedParametersToContainerDataProvider(): \Gen
         yield 'template root paths' => [
             [
                 [
-                    'template' => [
+                    'view' => [
                         'templateRootPaths' => $firstRootPaths,
                     ],
                 ],
                 [
-                    'template' => [
+                    'view' => [
                         'templateRootPaths' => $secondRootPaths,
                     ],
                 ],
@@ -136,12 +136,12 @@ public static function loadAddsResolvedParametersToContainerDataProvider(): \Gen
         yield 'partial root paths' => [
             [
                 [
-                    'template' => [
+                    'view' => [
                         'partialRootPaths' => $firstRootPaths,
                     ],
                 ],
                 [
-                    'template' => [
+                    'view' => [
                         'partialRootPaths' => $secondRootPaths,
                     ],
                 ],