[Security] [HttpDigest] Fixes a configuration error caused by an invalid 'key' child node configuration

Rui Marinho · Rui Marinho · commit fc41d4f2236a · 2012-04-04T14:28:24.000+01:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php
@@ -62,7 +62,7 @@ public function addConfiguration(NodeDefinition $node)
             ->children()
                 ->scalarNode('provider')->end()
                 ->scalarNode('realm')->defaultValue('Secured Area')->end()
-                ->scalarNode('key')->cannotBeEmpty()->end()
+                ->scalarNode('key')->isRequired()->cannotBeEmpty()->end()
             ->end()
         ;
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
@@ -48,7 +48,7 @@
         'simple' => array('pattern' => '/login', 'security' => false),
         'secure' => array('stateless' => true,
             'http_basic' => true,
-            'http_digest' => true,
+            'http_digest' => array('key' => 'TheKey'),
             'form_login' => true,
             'anonymous' => true,
             'switch_user' => true,
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
@@ -41,7 +41,7 @@
 
         <firewall name="secure" stateless="true">
             <http-basic />
-            <http-digest />
+            <http-digest key="TheKey" />
             <form-login />
             <anonymous />
             <switch-user />
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
@@ -35,7 +35,8 @@ security:
         secure:
             stateless: true
             http_basic: true
-            http_digest: true
+            http_digest:
+                key: TheKey
             form_login: true
             anonymous: true
             switch_user: true

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function addConfiguration(NodeDefinition $node)`
`62`	`62`	`->children()`
`63`	`63`	`->scalarNode('provider')->end()`
`64`	`64`	`->scalarNode('realm')->defaultValue('Secured Area')->end()`
`65`		`- ->scalarNode('key')->cannotBeEmpty()->end()`
	`65`	`+ ->scalarNode('key')->isRequired()->cannotBeEmpty()->end()`
`66`	`66`	`->end()`
`67`	`67`	`;`
`68`	`68`	`}`