[OptionsResolver] fix normalizer without corresponding option

Tobion · Tobion · commit e2a50ef4bc05 · 2012-08-27T05:42:35.000+02:00
diff --git a/src/Symfony/Component/OptionsResolver/Options.php b/src/Symfony/Component/OptionsResolver/Options.php
@@ -504,7 +504,7 @@ private function normalize($option)
         $normalizer = $this->normalizers[$option];
 
         $this->lock[$option] = true;
-        $this->options[$option] = $normalizer($this, $this->options[$option]);
+        $this->options[$option] = $normalizer($this, array_key_exists($option, $this->options) ? $this->options[$option] : null);
         unset($this->lock[$option]);
 
         // The option is now normalized
diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsTest.php
@@ -514,4 +514,15 @@ public function testClearOptionAndNormalizer()
         $this->options->clear();
         $this->assertEmpty($this->options->all());
     }
+
+    public function testNormalizerWithoutCorrespondingOption()
+    {
+        $test = $this;
+
+        $this->options->setNormalizer('foo', function (Options $options, $previousValue) use ($test) {
+            $test->assertNull($previousValue);
+            return '';
+        });
+        $this->assertEquals(array('foo' => ''), $this->options->all());
+    }
 }
