Skip to content

Commit 53c9776

Browse files
Merge branch '3.4' into 4.2
* 3.4: (24 commits) Apply php-cs-fixer rule for array_key_exists() [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 [Validator] Add the missing translations for the Greek (el) locale ...
2 parents d847676 + d40023c commit 53c9776

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Crawler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ private function relativize(string $xpath): string
971971
$expressions = [];
972972

973973
// An expression which will never match to replace expressions which cannot match in the crawler
974-
// We cannot simply drop
974+
// We cannot drop
975975
$nonMatchingExpression = 'a[name() = "b"]';
976976

977977
$xpathLen = \strlen($xpath);

Field/FileFormField.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function setValue($value)
6060

6161
// copy to a tmp location
6262
$tmp = sys_get_temp_dir().'/'.strtr(substr(base64_encode(hash('sha256', uniqid(mt_rand(), true), true)), 0, 7), '/', '_');
63-
if (array_key_exists('extension', $info)) {
63+
if (\array_key_exists('extension', $info)) {
6464
$tmp .= '.'.$info['extension'];
6565
}
6666
if (is_file($tmp)) {

FormFieldRegistry.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function remove($name)
5757
$target = &$this->fields;
5858
while (\count($segments) > 1) {
5959
$path = array_shift($segments);
60-
if (!array_key_exists($path, $target)) {
60+
if (!\array_key_exists($path, $target)) {
6161
return;
6262
}
6363
$target = &$target[$path];
@@ -80,7 +80,7 @@ public function &get($name)
8080
$target = &$this->fields;
8181
while ($segments) {
8282
$path = array_shift($segments);
83-
if (!array_key_exists($path, $target)) {
83+
if (!\array_key_exists($path, $target)) {
8484
throw new \InvalidArgumentException(sprintf('Unreachable field "%s"', $path));
8585
}
8686
$target = &$target[$path];

0 commit comments

Comments
 (0)