[SecurityBundle] minor simplification in main configuration

symfony · Nov 24, 2013 · 0d8c34b · 0d8c34b
1 parent 43becff
commit 0d8c34b
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -224,6 +224,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
                     ->ifTrue(function($v) { return isset($v['csrf_provider']); })
                     ->then(function($v) {
                         $v['csrf_token_generator'] = $v['csrf_provider'];
+                        unset($v['csrf_provider']);
 
                         return $v;
                     })
@@ -232,14 +233,6 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
                     ->ifTrue(function($v) { return isset($v['intention']); })
                     ->then(function($v) {
                         $v['csrf_token_id'] = $v['intention'];
-
-                        return $v;
-                    })
-                ->end()
-                ->beforeNormalization()
-                    ->always()
-                    ->then(function ($v) {
-                        unset($v['csrf_provider']);
                         unset($v['intention']);
 
                         return $v;