Merge remote-tracking branch 'origin/client-extra-plugins' into client-extra-plugins

dbu · dbu · commit ac21608d9d98 · 2016-08-12T15:56:53.000+02:00
Conflicts:
	DependencyInjection/Configuration.php
	Tests/Unit/DependencyInjection/ConfigurationTest.php
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -235,7 +235,6 @@ private function configureClientPlugins(ArrayNodeDefinition $pluginNode)
 
             ->validate()
                 ->always(function ($plugins) {
-
                     foreach ($plugins as $name => $definition) {
                         if ('authentication' === $name) {
                             if (!count($definition)) {
diff --git a/Tests/Unit/DependencyInjection/ConfigurationTest.php b/Tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -159,7 +159,7 @@ public function testSupportsAllConfigFormats()
                                     'password' => 'bar',
                                 ],
                             ],
-                        ]
+                        ],
                     ],
                     'config' => [],
                 ],
