From d60626efd5a17fcca018e8d6edeb693de90f53ef Mon Sep 17 00:00:00 2001
From: Bernhard Schussek <bschussek@gmail.com>
Date: Mon, 14 May 2012 18:53:26 +0200
Subject: [PATCH] [OptionsResolver] Fixed clear() and remove() method in
 Options class

---
 .../OptionsResolver/Exception/ExceptionInterface.php         | 0
 src/Symfony/Component/OptionsResolver/Options.php            | 5 ++++-
 2 files changed, 4 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 src/Symfony/Component/OptionsResolver/Exception/ExceptionInterface.php

diff --git a/src/Symfony/Component/OptionsResolver/Exception/ExceptionInterface.php b/src/Symfony/Component/OptionsResolver/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
diff --git a/src/Symfony/Component/OptionsResolver/Options.php b/src/Symfony/Component/OptionsResolver/Options.php
index 61d01c918a..25e47677f3 100644
--- a/src/Symfony/Component/OptionsResolver/Options.php
+++ b/src/Symfony/Component/OptionsResolver/Options.php
@@ -111,7 +111,7 @@ class Options implements ArrayAccess, Iterator, Countable
         }
 
         $this->options = array();
-        
+
         foreach ($options as $option => $value) {
             $this->set($option, $value);
         }
@@ -219,6 +219,7 @@ class Options implements ArrayAccess, Iterator, Countable
 
         unset($this->options[$option]);
         unset($this->lock[$option]);
+        unset($this->lazy[$option]);
     }
 
     /**
@@ -235,6 +236,8 @@ class Options implements ArrayAccess, Iterator, Countable
         }
 
         $this->options = array();
+        $this->lock = array();
+        $this->lazy = array();
     }
 
     /**