clarified exception message to show the actual type passed to the resolver

Cas Leentfaar · Cas Leentfaar · commit e4bff68243df · 2014-10-06T09:01:57.000+02:00
further improved message of the exception
diff --git a/src/Symfony/Component/OptionsResolver/Options.php b/src/Symfony/Component/OptionsResolver/Options.php
@@ -241,21 +241,64 @@ public static function validateTypes(array $options, array $acceptedTypes)
                 }
             }
 
-            $printableValue = is_object($value)
-                ? get_class($value)
-                : (is_array($value)
-                    ? 'Array'
-                    : (string) $value);
-
             throw new InvalidOptionsException(sprintf(
                 'The option "%s" with value "%s" is expected to be of type "%s"',
                 $option,
-                $printableValue,
-                implode('", "', $optionTypes)
+                self::createPrintableValue($value),
+                implode('", "', array_map(function ($optionType) { return self::createPrintableType($optionType); }, $optionTypes))
             ));
         }
     }
 
+    /**
+     * Attempts to convert a given value into a (short) string or integer.
+     *
+     * @param mixed $value The value to convert.
+     *
+     * @return string The printable value.
+     */
+    private static function createPrintableValue($value)
+    {
+        if (is_object($value)) {
+            return get_class($value);
+        }
+
+        if (is_array($value)) {
+            return 'Array';
+        }
+
+        if (null === $value) {
+            return 'null';
+        }
+
+        if (is_string($value)) {
+            return '"'.$value.'"';
+        }
+
+        if (is_bool($value)) {
+            return (string) var_export($value, true);
+        }
+
+        return (string) $value;
+    }
+
+    /**
+     * Attempts to convert a given value's type into a printable string.
+     * 
+     * @param mixed $value The value to convert.
+     *
+     * @return string Objects get returned as their classname,
+     *                all other values are put through gettype().
+     */
+    private static function createPrintableType($value)
+    {
+        if (is_object($value)) {
+            return get_class($value);
+        } else {
+            return gettype($value);
+        }
+    }
+
     /**
      * Validates that the given option values match the accepted values and
      * throws an exception otherwise.
