Skip to content

Commit 2fb3704

Browse files
Merge branch '4.2'
* 4.2: (26 commits) Apply php-cs-fixer rule for array_key_exists() [Cache] fix warming up cache.system and apcu [Security] Change FormAuthenticator if condition handles multi-byte characters in autocomplete speed up tests running them without debug flag [Translations] added missing Croatian validators Fix getItems() performance issue with RedisCluster (php-redis) [VarDumper] Keep a ref to objects to ensure their handle cannot be reused while cloning IntegerType: reject submitted non-integer numbers be keen to newcomers [HttpKernel] Fix possible infinite loop of exceptions fixed CS [Validator] Added missing translations for Afrikaans do not validate non-submitted form fields in PATCH requests Update usage example in ArrayInput doc block. [Console] Prevent ArgvInput::getFirstArgument() from returning an option value [Validator] Fixed duplicate UUID fixed CS [EventDispatcher] Fix unknown priority Avoid mutating the Finder when building the iterator ...
2 parents 9744e59 + 761fa56 commit 2fb3704

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Inline.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ private static function evaluateScalar(string $scalar, int $flags, array $refere
555555
throw new ParseException('A reference must contain at least one character.', self::$parsedLineNumber + 1, $value, self::$parsedFilename);
556556
}
557557

558-
if (!array_key_exists($value, $references)) {
558+
if (!\array_key_exists($value, $references)) {
559559
throw new ParseException(sprintf('Reference "%s" does not exist.', $value), self::$parsedLineNumber + 1, $value, self::$parsedFilename);
560560
}
561561

Parser.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ private function doParse(string $value, int $flags)
237237
$allowOverwrite = true;
238238
if (isset($values['value'][0]) && '*' === $values['value'][0]) {
239239
$refName = substr(rtrim($values['value']), 1);
240-
if (!array_key_exists($refName, $this->refs)) {
240+
if (!\array_key_exists($refName, $this->refs)) {
241241
if (false !== $pos = array_search($refName, $this->refsBeingParsed, true)) {
242242
throw new ParseException(sprintf('Circular reference [%s, %s] detected for reference "%s".', implode(', ', \array_slice($this->refsBeingParsed, $pos)), $refName, $refName), $this->currentLineNb + 1, $this->currentLine, $this->filename);
243243
}
@@ -653,7 +653,7 @@ private function parseValue(string $value, int $flags, string $context)
653653
$value = substr($value, 1);
654654
}
655655

656-
if (!array_key_exists($value, $this->refs)) {
656+
if (!\array_key_exists($value, $this->refs)) {
657657
if (false !== $pos = array_search($value, $this->refsBeingParsed, true)) {
658658
throw new ParseException(sprintf('Circular reference [%s, %s] detected for reference "%s".', implode(', ', \array_slice($this->refsBeingParsed, $pos)), $value, $value), $this->currentLineNb + 1, $this->currentLine, $this->filename);
659659
}

0 commit comments

Comments
 (0)