Merge branch '5.0' into 5.1

* 5.0: [PagePartBundle] Keep yaml array keys when merging multiple configs fixed broken composer json
Kunstmaan · Jan 14, 2019 · b260ec7 · b260ec7
2 parents e86e6dd + 217db40
commit b260ec7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Kunstmaan/GeneratorBundle/composer.json b/src/Kunstmaan/GeneratorBundle/composer.json
@@ -20,7 +20,7 @@
         "sensio/generator-bundle": "~2.5|~3.0",
         "fzaninotto/faker": "~1.4.0",
         "kunstmaan/utilities-bundle": "~3.2",
-        "twig/twig": "^1.12|^2.0",
+        "twig/twig": "^1.12|^2.0"
     },
     "suggest": {
         "kunstmaan/admin-bundle": "~3.2",

diff --git a/src/Kunstmaan/PagePartBundle/DependencyInjection/Configuration.php b/src/Kunstmaan/PagePartBundle/DependencyInjection/Configuration.php
@@ -27,7 +27,7 @@ public function getConfigTreeBuilder()
             ->end();
 
         /** @var ArrayNodeDefinition $pageparts */
-        $pageparts = $root->children()->arrayNode('pageparts')->prototype('array');
+        $pageparts = $root->children()->arrayNode('pageparts')->useAttributeAsKey('index')->prototype('array');
         $pageparts->children()->scalarNode('name')->isRequired();
         $pageparts->children()->scalarNode('context')->isRequired();
         $pageparts->children()->scalarNode('extends');
@@ -43,7 +43,7 @@ public function getConfigTreeBuilder()
         // *************************************************************************************************************
 
         /** @var ArrayNodeDefinition $pagetemplates */
-        $pagetemplates = $root->children()->arrayNode('pagetemplates')->defaultValue([])->prototype('array');
+        $pagetemplates = $root->children()->arrayNode('pagetemplates')->useAttributeAsKey('index')->defaultValue([])->prototype('array');
 
         $pagetemplates->children()->scalarNode('template')->isRequired();
         $pagetemplates->children()->scalarNode('name')->isRequired();