Format the exception message clearer: in case complex typed arrays co…

…ntain valid and invalid arguments, list all the values they contain + add test case
symfony · EVODelavega · Sep 2, 2015 · Sep 2, 2015 · Sep 2, 2015 · Sep 2, 2015
commit 82d463f2e9d9b6bd9bd886c96a03ca2aef0c5417
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -993,9 +993,9 @@ public function count()
     *
     * @return string The type of the value
     */
-    private function formatTypeOf($value, $option)
+    private function formatTypeOf($value, $option = null)
    {
-        if (is_array($value)) {
+        if (is_array($value) && $option) {
            foreach ($this->allowedTypes[$option] as $type) {
                if (substr($type, -2) === '[]') {
                    return $this->formatComplexTypeOf($value, $type);
@@ -1031,12 +1031,21 @@ private function formatComplexTypeOf(array $value, $type)
            $suffix .= '[]';
        }
        if (is_array($value)) {
-            $value = array_shift($value);//get first element
+            $subTypes = array();
+            foreach ($value as $v) {
+                $v = $this->formatTypeOf($v);
+                if (!isset($subTypes[$v])) {
+                    $subTypes[$v] = $v;//build unique map from the off
+                }
+            }
+            $vType = implode('|', $subTypes);
+        } else {
+            $vType = is_object($value) ? get_class($value) : gettype($value);
        }

        return sprintf(
            '%s%s',
-            is_object($value) ? get_class($value) : gettype($value),
+            $vType,
            $suffix
        );
    }

diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
@@ -512,6 +512,23 @@ public function testResolveFailsIfInvalidTypedArray()

    /**
     * @dataProvider provideInvalidTypes
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     * @expectedExceptionMessage The option "foo" with value array is expected to be of type "int[]", but is of type "integer|stdClass|array|DateTime[]".
+     */
+    public function testResolveFailsIfTypedArrayContainsInvalidTypes()
+    {
+        $this->resolver->setDefined('foo');
+        $this->resolver->setAllowedTypes('foo', 'int[]');
+        $values = range(1, 5);
+        $values[] = new \stdClass;
+        $values[] = array();
+        $values[] = new \DateTime();
+        $values[] = 123;
+
+        $this->resolver->resolve(array('foo' => $values));
+    }
+
+    /**
     * @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".
     */