From cb8161da7bed8deec3188592648d19330ff2f048 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 20 Oct 2010 09:49:00 +0200
Subject: [PATCH] [FrameworkBundle] removed support for none as an equivalent
 to false/null

---
 .../FrameworkBundle/DependencyInjection/SecurityExtension.php   | 2 +-
 .../Tests/DependencyInjection/Fixtures/xml/firewall.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/SecurityExtension.php
index f87f563c54..04c2309535 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/SecurityExtension.php
@@ -174,7 +174,7 @@ class SecurityExtension extends Extension
         }
 
         // Security disabled?
-        if (isset($firewall['security']) && ('none' === $firewall['security'] || !$firewall['security'])) {
+        if (isset($firewall['security']) && !$firewall['security']) {
             return array($matcher, array(), null);
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/firewall.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/firewall.xml
index e151854422..898619ffe8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/firewall.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/firewall.xml
@@ -10,7 +10,7 @@
             <user name="foo" password="foo" roles="ROLE_USER" />
         </provider>
 
-        <firewall pattern="/login" security="none" />
+        <firewall pattern="/login" security="false" />
 
         <firewall stateless="true">
             <http-basic />