8000 [OptionsResolver] Exception doesn't report the actual type used by cleentfaar · Pull Request #11021 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[OptionsResolver] Exception doesn't report the actual type used #11021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

[OptionsResolver] Exception doesn't report the actual type used #11021

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0de9a59
clarified exception message to show the actual type passed to the res…
May 30, 2014
004e832
simplified methods
Oct 10, 2014
dd01472
removed bad indent
Oct 10, 2014
b7409f2
removed bad indents
Oct 10, 2014
18a8d10
replaced 'static'-calls with 'self', removed alignment
Oct 13, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
replaced 'static'-calls with 'self', removed alignment
  • Loading branch information
Cas Leentfaar committed Oct 13, 2014
commit 18a8d10fe65fa191c2a06776278d0242468f2678
28 changes: 14 additions & 14 deletions src/Symfony/Component/OptionsResolver/Options.php
View file
10000 Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ class Options implements \ArrayAccess, \Iterator, \Countable
public static function resolve(array $options, $defaults)
{
if (is_array($defaults)) {
static::validateNames($options, $defaults, true);
self::validateNames($options, $defaults, true);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

validateNames() is public. Therefore, static must be kept here.


return array_replace($defaults, $options);
}

if ($defaults instanceof self) {
static::validateNames($options, $defaults->options, true);
self::validateNames($options, $defaults->options, true);

// Make sure this method can be called multiple times
$combinedOptions = clone $defaults;
Expand All @@ -119,8 +119,8 @@ public static function resolve(array $options, $defaults)
}

if ($defaults instanceof OptionsConfig) {
static::validateNames($options, $defaults->knownOptions, true);
static::validateRequired($options, $defaults->requiredOptions, true);
self::validateNames($options, $defaults->knownOptions, true);
self::validateRequired($options, $defaults->requiredOptions, true);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same applies to validateRequired().


// Make sure this method can be called multiple times
$combinedOptions = clone $defaults->defaultOptions;
Expand All @@ -133,8 +133,8 @@ public static function resolve(array $options, $defaults)
// Resolve options
$resolvedOptions = $combinedOptions->all();

static::validateTypes($resolvedOptions, $defaults->allowedTypes);
static::validateValues($resolvedOptions, $defaults->allowedValues);
self::validateTypes($resolvedOptions, $defaults->allowedTypes);
self::validateValues($resolvedOptions, $defaults->allowedValues);

return $resolvedOptions;
}
Expand Down Expand Up @@ -263,8 +263,8 @@ public static function validateTypes(array $options, array $acceptedTypes)
throw new InvalidOptionsException(sprintf(
'The option "%s" with value "%s" is expected to be of type "%s"',
$option,
static::formatValue($value),
static::formatTypesOf($optionTypes)
self::formatValue($value),
self::formatTypesOf($optionTypes)
));
}
}
Expand All @@ -288,7 +288,7 @@ public static function validateValues(array $options, array $acceptedValues)
foreach ($acceptedValues as $option => $optionValues) {
if (array_key_exists($option, $options)) {
if (is_array($optionValues) && !in_array($options[$option], $optionValues, true)) {
throw new InvalidOptionsException(sprintf('The option "%s" has the value "%s", but is expected to be one of "%s"', $option, $options[$option], static::formatValues($optionValues)));
throw new InvalidOptionsException(sprintf('The option "%s" has the value "%s", but is expected to be one of "%s"', $option, $options[$option], self::formatValues($optionValues)));
}

if (is_callable($optionValues) && !call_user_func($optionValues, $options[$option])) {
Expand Down Expand Up @@ -325,7 +325,7 @@ private static function formatTypeOf($value)
private static function formatTypesOf(array $types)
{
foreach ($types as $key => $value) {
$types[$key] = static::formatTypeOf($value);
$types[$key] = self::formatTypeOf($value);
}

return implode(', ', $types);
Expand All @@ -348,9 +348,9 @@ private static function formatTypesOf(array $types)
private static function formatValue($value)
{
$isDateTime = $value instanceof \DateTime || $value instanceof \DateTimeInterface;
if (static::PRETTY_DATE && $isDateTime) {
if (self::PRETTY_DATE && $isDateTime) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a condition with a constant? makes no sense

if (class_exists('IntlDateFormatter')) {
$locale = \Locale::getDefault();
$locale = \Locale::getDefault();
$formatter = new \IntlDateFormatter($locale, \IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT);
// neither the native nor the stub IntlDateFormatter support
// DateTimeImmutable as of yet
Expand All @@ -368,7 +368,7 @@ private static function formatValue($value)
}

if (is_object($value)) {
if (static::OBJECT_TO_STRING && method_exists($value, '__toString')) {
if (self::OBJECT_TO_STRING && method_exists($value, '__toString')) {
return $value->__toString();
}

Expand Down Expand Up @@ -417,7 +417,7 @@ private static function formatValue($value)
private static function formatValues(array $values)
{
foreach ($values as $key => $value) {
$values[$key] = static::formatValue($value);
$values[$key] = self::formatValue($value);
}

return implode(', ', $values);
Expand Down
0