symfony
diff --git a/‎src/Symfony/Component/OptionsResolver/OptionsResolver.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/OptionsResolver/OptionsResolver.php
+55-27Lines changed: 55 additions & 27 deletions b/‎src/Symfony/Component/OptionsResolver/OptionsResolver.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/OptionsResolver/OptionsResolver.php
+55-27Lines changed: 55 additions & 27 deletions
@@ -301,12 +301,11 @@ private function validateOptionValues(array $options)
         foreach ($this->allowedValues as $option => $allowedValues) {
             if (isset($options[$option])) {
                 if (is_array($allowedValues) && !in_array($options[$option], $allowedValues, true)) {
-                    $allowedValuesPrintable = implode(', ', array_map(array($this, 'createPrintableValue'), $allowedValues));
-                    throw new InvalidOptionsException(sprintf('The option "%s" has the value %s, but is expected to be one of %s', $option, $this->createPrintableValue($options[$option]), $allowedValuesPrintable));
+                    throw new InvalidOptionsException(sprintf('The option "%s" has the value %s, but is expected to be one of %s', $option, $this->formatValue($options[$option]), $this->formatValues($allowedValues)));
                 }
 
                 if (is_callable($allowedValues) && !call_user_func($allowedValues, $options[$option])) {
-                    throw new InvalidOptionsException(sprintf('The option "%s" has the value %s, which is not valid', $option, $this->createPrintableValue($options[$option])));
+                    throw new InvalidOptionsException(sprintf('The option "%s" has the value %s, which is not valid', $option, $this->formatValue($options[$option])));
                 }
             }
         }
@@ -341,65 +340,94 @@ private function validateOptionTypes(array $options)
                 }
             }
 
-            $printableValue = $this->createPrintableValue($value);
-            $printableType  = $this->createPrintableType($value);
-
             throw new InvalidOptionsException(sprintf(
                 'The option "%s" with value %s is expected to be of type "%s", got "%s"',
                 $option,
-                $printableValue,
+                $this->formatValue($value),
                 implode('", "', $allowedTypes),
-                $printableType
+                $this->formatTypeOf($value)
             ));
         }
     }
 
     /**
-     * Attempts to convert a given value into a (short) string or integer.
+     * Returns a string representation of the type of the value.
+     *
+     * @param mixed $value
+     *
+     * @return string
+     */
+    protected function formatTypeOf($value)
+    {
+        return is_object($value) ? get_class($value) : gettype($value);
+    }
+
+    /**
+     * Returns a string representation of the value.
      *
-     * @param mixed $value The value to convert.
+     * @param mixed $value
+     * @param bool  $prettyDateTime
      *
-     * @return string The printable value.
+     * @return string
      */
-    private function createPrintableValue($value)
+    protected function formatValue($value, $prettyDateTime = false)
     {
+        if ($prettyDateTime && $value instanceof \DateTime) {
+            if (class_exists('IntlDateFormatter')) {
+                $locale = \Locale::getDefault();
+                $formatter = new \IntlDateFormatter($locale, \IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT);
+
+                return $formatter->format($value);
+            }
+
+            return $value->format('Y-m-d H:i:s');
+        }
+
         if (is_object($value)) {
-            return get_class($value);
+            return 'object';
         }
 
         if (is_array($value)) {
-            return 'Array';
+            return 'array';
+        }
+
+        if (is_string($value)) {
+            return '"'.$value.'"';
+        }
+
+        if (is_resource($value)) {
+            return 'resource';
         }
 
         if (null === $value) {
             return 'null';
         }
 
-        if (is_string($value)) {
-            return '"'.$value.'"';
+        if (false === $value) {
+            return 'false';
         }
 
-        if (is_bool($value)) {
-            return (string) var_export($value, true);
+        if (true === $value) {
+            return 'true';
         }
 
         return (string) $value;
     }
 
     /**
-     * Attempts to convert a given value's type into a printable string.
+     * Returns a string representation of a list of values.
      *
-     * @param mixed $value The value to convert.
+     * @param array $values
+     * @param bool  $prettyDateTime
      *
-     * @return string Objects get returned as their classname,
-     *                all other values are put through gettype().
+     * @return string
      */
-    private function createPrintableType($value)
+    protected function formatValues(array $values, $prettyDateTime = false)
     {
-        if (is_object($value)) {
-            return get_class($value);
-        } else {
-            return gettype($value);
+        foreach ($values as $key => $value) {
+            $values[$key] = $this->formatValue($value, $prettyDateTime);
         }
+
+        return implode(', ', $values);
     }
 }