Skip to content

Commit 353fde2

Browse files
Merge branch '4.1'
* 4.1: [TwigBridge] fix lowest version of symfony/form Think positive KernelInterface can return null container [DI] Detect circular references with ChildDefinition parent [VarDumper] Fix global dump function return value for PHP7 [Ldap] Use shut up operator on connection errors at ldap_start_tls Implement startTest rather than startTestSuite [OptionsResolver] remove dead code and useless else [HttpFoundation] don't override StreamedResponse::setNotModified() Added relevent links for parsing to the phpdoc Add stricter checking for valid date time string Fix symfony/console (optional) dependency for MonologBridge fix not displaying labels when value is false [Form] Fix DateTimeType html5 input format
2 parents 9cebb5b + 40f0e40 commit 353fde2

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

OptionsResolver.php

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,9 @@ public function offsetGet($option)
828828

829829
// Don't include closures in the exception message
830830
continue;
831-
} elseif ($value === $allowedValue) {
831+
}
832+
833+
if ($value === $allowedValue) {
832834
$success = true;
833835
break;
834836
}
@@ -1112,17 +1114,4 @@ private static function isValueValidType(string $type, $value): bool
11121114
{
11131115
return (\function_exists($isFunction = 'is_'.$type) && $isFunction($value)) || $value instanceof $type;
11141116
}
1115-
1116-
private function getInvalidValues(array $arrayValues, string $type): array
1117-
{
1118-
$invalidValues = array();
1119-
1120-
foreach ($arrayValues as $key => $value) {
1121-
if (!self::isValueValidType($type, $value)) {
1122-
$invalidValues[$key] = $value;
1123-
}
1124-
}
1125-
1126-
return $invalidValues;
1127-
}
11281117
}

0 commit comments

Comments
 (0)