From 9c76750cb8aea89ea51b28fbda8fb6081a50f434 Mon Sep 17 00:00:00 2001
From: Bernhard Schussek <bschussek@gmail.com>
Date: Fri, 11 May 2012 10:31:19 +0200
Subject: [PATCH] [OptionsResolver] Fixed doc and block nesting

---
 .../Component/OptionsResolver/Options.php        | 10 +++++-----
 .../OptionsResolver/OptionsResolver.php          | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Symfony/Component/OptionsResolver/Options.php b/src/Symfony/Component/OptionsResolver/Options.php
index 78ebf30535..dffdc113c7 100644
--- a/src/Symfony/Component/OptionsResolver/Options.php
+++ b/src/Symfony/Component/OptionsResolver/Options.php
@@ -165,7 +165,7 @@ class Options implements ArrayAccess, Iterator
     }
 
     /**
-     * @see Iterator::current()
+     * {@inheritdoc}
      */
     public function current()
     {
@@ -173,7 +173,7 @@ class Options implements ArrayAccess, Iterator
     }
 
     /**
-     * @see Iterator::next()
+     * {@inheritdoc}
      */
     public function next()
     {
@@ -181,7 +181,7 @@ class Options implements ArrayAccess, Iterator
     }
 
     /**
-     * @see Iterator::key()
+     * {@inheritdoc}
      */
     public function key()
     {
@@ -189,7 +189,7 @@ class Options implements ArrayAccess, Iterator
     }
 
     /**
-     * @see Iterator::valid()
+     * {@inheritdoc}
      */
     public function valid()
     {
@@ -197,7 +197,7 @@ class Options implements ArrayAccess, Iterator
     }
 
     /**
-     * @see Iterator::rewind()
+     * {@inheritdoc}
      */
     public function rewind()
     {
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
index a9513a5f35..1e738af6a2 100644
--- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php
+++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -253,11 +253,11 @@ class OptionsResolver
 
         sort($diff);
 
-        if (count($diff) > 1) {
-            throw new InvalidOptionsException(sprintf('The options "%s" do not exist. Known options are: "%s"', implode('", "', $diff), implode('", "', $knownOptions)));
-        }
-
         if (count($diff) > 0) {
+            if (count($diff) > 1) {
+                throw new InvalidOptionsException(sprintf('The options "%s" do not exist. Known options are: "%s"', implode('", "', $diff), implode('", "', $knownOptions)));
+            }
+
             throw new InvalidOptionsException(sprintf('The option "%s" does not exist. Known options are: "%s"', current($diff), implode('", "', $knownOptions)));
         }
 
@@ -268,11 +268,11 @@ class OptionsResolver
 
         sort($diff);
 
-        if (count($diff) > 1) {
-            throw new MissingOptionsException(sprintf('The options "%s" are missing.', implode('", "', $diff)));
-        }
-
         if (count($diff) > 0) {
+            if (count($diff) > 1) {
+                throw new MissingOptionsException(sprintf('The options "%s" are missing.', implode('", "', $diff)));
+            }
+
             throw new MissingOptionsException(sprintf('The option "%s" is missing.', current($diff)));
         }
     }