Format complex types in exception message, too

symfony · EVODelavega · Sep 2, 2015 · Sep 2, 2015 · Sep 2, 2015 · Sep 2, 2015
commit 2685d2ee5b7b3b0d929fcf83d6dfdf15dd8813b5
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -807,7 +807,7 @@ public function offsetGet($option)
                    $option,
                    $this->formatValue($value),
                    implode('" or "', $this->allowedTypes[$option]),
-                    $this->formatTypeOf($value)
+                    $this->formatTypeOf($value, $option)
                ));
            }
        }
@@ -989,14 +989,56 @@ public function count()
     * non-technical people.
     *
     * @param mixed $value The value to return the type of
+     * @param string $option The option that holds the value
     *
     * @return string The type of the value
     */
-    private function formatTypeOf($value)
+    private function formatTypeOf($value, $option)
    {
+        if (is_array($value)) {
+            foreach ($this->allowedTypes[$option] as $type) {
+                if (substr($type, -2) === '[]') {
+                    return $this->formatComplexTypeOf($value, $type);
+                }
+            }
+        }
        return is_object($value) ? get_class($value) : gettype($value);
    }

+    /**
+     * Returns a string represnetation of the complex type of the value
+     *
+     * This method should be called in formatTypeOf, if there is a complex allowed type
+     * for an array value defined to get a more explicit exception message
+     *
+     * @param array $value The value to return the complex type of
+     * @param string $type the expected type
+     *
+     * @return string the complex type of the value
+     */
+    private function formatComplexTypeOf(array $value, $type)
+    {
+        $suffix = '[]';
+        $type = substr($type, 0, -2);
+        while (substr($type, -2) === '[]') {
+            $value = array_shift($value);
+            if (!is_array($value)) {
+                //expected a nested array, but we've already hit a scalar
+                break;
+            }
+            $type = substr($type, 0, -2);
+            $suffix .= '[]';
+        }
+        if (is_array($value)) {
+            $value = array_shift($value);//get first element
+        }
+        return sprintf(
+            '%s%s',
+            is_object($value) ? get_class($value) : gettype($value),
+            $suffix
+        );
+    }
+
    /**
     * Returns a string representation of the value.
     *

diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
@@ -500,7 +500,7 @@ public function testFailIfSetAllowedTypesFromLazyOption()

    /**
     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
-     * @expectedExceptionMessage The option "foo" with value array is expected to be of type "int[]", but is of type "array".
+     * @expectedExceptionMessage The option "foo" with value array is expected to be of type "int[]", but is of type "DateTime[]".
     */
    public function testResolveFailsIfInvalidTypedArray()
    {