Merge pull request #75 from knpuniversity/config-merge-fix

fixing bug with merging config
knpuniversity · Jan 22, 2018 · 8608423 · 8608423
2 parents 2649cf9 + f86a875
commit 8608423
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -23,6 +23,8 @@ public function getConfigTreeBuilder()
         $rootNode
             ->children()
             ->arrayNode('clients')
+                ->normalizeKeys(false)
+                ->useAttributeAsKey('variable')
                 ->prototype('array')
                     ->prototype('variable')->end()
                 ->end()

diff --git a/tests/DependencyInjection/ConfigurationTest.php b/tests/DependencyInjection/ConfigurationTest.php
@@ -73,4 +73,31 @@ public function provideConfigurationTests()
 
         return $tests;
     }
+
+    public function testClientMergingConfig()
+    {
+        $fbConfig = [
+            'type' => 'facebook',
+            'client_id' => 'ABC',
+            'client_secret' => '123',
+            'graph_api_version' => '2.3',
+            'redirect_route' => 'my_route',
+            'redirect_params' => ['foo' => 'bars'],
+        ];
+
+        $processor = new Processor();
+
+        $config = $processor->processConfiguration(
+            new Configuration(), [
+                ['clients' => ['fb1' => $fbConfig]],
+                ['clients' => ['fb2' => $fbConfig]],
+            ]
+        );
+
+        // verify the client keys are merged nicely
+        $this->assertSame(
+            ['fb1', 'fb2'],
+            array_keys($config['clients'])
+        );
+    }
 }