Skip to content

Commit 40f0e40

Browse files
Merge branch '3.4' into 4.1
* 3.4: 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 [Form] Fix DateTimeType html5 input format
2 parents b4e6119 + 1cf7d8e commit 40f0e40

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
@@ -770,7 +770,9 @@ public function offsetGet($option)
770770

771771
// Don't include closures in the exception message
772772
continue;
773-
} elseif ($value === $allowedValue) {
773+
}
774+
775+
if ($value === $allowedValue) {
774776
$success = true;
775777
break;
776778
}
@@ -1041,17 +1043,4 @@ private static function isValueValidType(string $type, $value): bool
10411043
{
10421044
return (\function_exists($isFunction = 'is_'.$type) && $isFunction($value)) || $value instanceof $type;
10431045
}
1044-
1045-
private function getInvalidValues(array $arrayValues, string $type): array
1046-
{
1047-
$invalidValues = array();
1048-
1049-
foreach ($arrayValues as $key => $value) {
1050-
if (!self::isValueValidType($type, $value)) {
1051-
$invalidValues[$key] = $value;
1052-
}
1053-
}
1054-
1055-
return $invalidValues;
1056-
}
10571046
}

0 commit comments

Comments
 (0)