[OptionsResolver] Fixed doc and block nesting

webmozart · webmozart · commit 9c76750cb8ae · 2012-05-14T19:35:35.000+02:00
diff --git a/src/Symfony/Component/OptionsResolver/Options.php b/src/Symfony/Component/OptionsResolver/Options.php
@@ -165,39 +165,39 @@ public function offsetUnset($option)
     }
 
     /**
-     * @see Iterator::current()
+     * {@inheritdoc}
      */
     public function current()
     {
         return $this->offsetGet($this->key());
     }
 
     /**
-     * @see Iterator::next()
+     * {@inheritdoc}
      */
     public function next()
     {
         next($this->options);
     }
 
     /**
-     * @see Iterator::key()
+     * {@inheritdoc}
      */
     public function key()
     {
         return key($this->options);
     }
 
     /**
-     * @see Iterator::valid()
+     * {@inheritdoc}
      */
     public function valid()
     {
         return null !== $this->key();
     }
 
     /**
-     * @see Iterator::rewind()
+     * {@inheritdoc}
      */
     public function rewind()
     {
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -253,11 +253,11 @@ private function validateOptionNames(array $optionNames)
 
         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 @@ private function validateOptionNames(array $optionNames)
 
         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)));
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -165,39 +165,39 @@ public function offsetUnset($option)`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`/**`
`168`		`- * @see Iterator::current()`
	`168`	`+ * {@inheritdoc}`
`169`	`169`	`*/`
`170`	`170`	`public function current()`
`171`	`171`	`{`
`172`	`172`	`return $this->offsetGet($this->key());`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`/**`
`176`		`- * @see Iterator::next()`
	`176`	`+ * {@inheritdoc}`
`177`	`177`	`*/`
`178`	`178`	`public function next()`
`179`	`179`	`{`
`180`	`180`	`next($this->options);`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`/**`
`184`		`- * @see Iterator::key()`
	`184`	`+ * {@inheritdoc}`
`185`	`185`	`*/`
`186`	`186`	`public function key()`
`187`	`187`	`{`
`188`	`188`	`return key($this->options);`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`/**`
`192`		`- * @see Iterator::valid()`
	`192`	`+ * {@inheritdoc}`
`193`	`193`	`*/`
`194`	`194`	`public function valid()`
`195`	`195`	`{`
`196`	`196`	`return null !== $this->key();`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`/**`
`200`		`- * @see Iterator::rewind()`
	`200`	`+ * {@inheritdoc}`
`201`	`201`	`*/`
`202`	`202`	`public function rewind()`
`203`	`203`	`{`