[OptionsResolver] fix invalid value exception formatting

Author: Tobion

OptionsResolver.php

@@ -848,7 +848,7 @@ public function offsetGet($option)
                     '"%s", but is of type "%s".',
                     $option,
                     $this->formatValue($value),
-                    implode('", "', $this->allowedTypes[$option]),
+                    implode('" or "', $this->allowedTypes[$option]),
                     $this->formatTypeOf($value)
                 ));
             }
@@ -873,9 +873,7 @@ public function offsetGet($option)
                     break;
                 }
 
-                $printableAllowedValues[] = is_object($value)
-                    ? get_class($value)
-                    : (is_array($value) ? 'array' : (string) $value);
+                $printableAllowedValues[] = $allowedValue;
             }
 
             if (!$success) {
@@ -887,7 +885,7 @@ public function offsetGet($option)
 
                 if (count($printableAllowedValues) > 0) {
                     $message .= sprintf(
-                        ' Accepted values are: %s',
+                        ' Accepted values are: %s.',
                         $this->formatValues($printableAllowedValues)
                     );
                 }

Tests/OptionsResolver2Dot6Test.php

@@ -490,6 +490,7 @@ public function testFailIfSetAllowedTypesFromLazyOption()
 
     /**
      * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     * @expectedExceptionMessage The option "foo" with value 42 is expected to be of type "string", but is of type "integer".
      */
     public function testResolveFailsIfInvalidType()
     {
@@ -509,6 +510,7 @@ public function testResolveSucceedsIfValidType()
 
     /**
      * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     * @expectedExceptionMessage The option "foo" with value 42 is expected to be of type "string" or "bool", but is of type "integer".
      */
     public function testResolveFailsIfInvalidTypeMultiple()
     {
@@ -659,6 +661,7 @@ public function testFailIfSetAllowedValuesFromLazyOption()
 
     /**
      * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     * @expectedExceptionMessage The option "foo" with value 42 is invalid. Accepted values are: "bar".
      */
     public function testResolveFailsIfInvalidValue()
     {
@@ -689,11 +692,12 @@ public function testResolveSucceedsIfValidValue()
 
     /**
      * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     * @expectedExceptionMessage The option "foo" with value 42 is invalid. Accepted values are: "bar", false, null.
      */
     public function testResolveFailsIfInvalidValueMultiple()
     {
         $this->resolver->setDefault('foo', 42);
-        $this->resolver->setAllowedValues('foo', array('bar', 'baz'));
+        $this->resolver->setAllowedValues('foo', array('bar', false, null));
 
         $this->resolver->resolve();
     }