Skip to content

Commit 94b24ac

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 fe23b12 + 10d9506 commit 94b24ac

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

DependencyInjection/CompilerPass/RegisterMappingsPass.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
* The compiler pass is meant to register the mappings with the metadata
2525
* chain driver corresponding to one of the object managers.
2626
*
27-
* For concrete implementations that are easy to use, see the
28-
* RegisterXyMappingsPass classes in the DoctrineBundle resp.
27+
* For concrete implementations, see the RegisterXyMappingsPass classes
28+
* in the DoctrineBundle resp.
2929
* DoctrineMongodbBundle, DoctrineCouchdbBundle and DoctrinePhpcrBundle.
3030
*
3131
* @author David Buchmann <[email protected]>

Form/DoctrineOrmTypeGuesser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ protected function getMetadata($class)
165165
// normalize class name
166166
$class = self::getRealClass(ltrim($class, '\\'));
167167

168-
if (array_key_exists($class, $this->cache)) {
168+
if (\array_key_exists($class, $this->cache)) {
169169
return $this->cache[$class];
170170
}
171171

Security/User/EntityUserProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/**
2121
* Wrapper around a Doctrine ObjectManager.
2222
*
23-
* Provides easy to use provisioning for Doctrine entity users.
23+
* Provides provisioning for Doctrine entity users.
2424
*
2525
* @author Fabien Potencier <[email protected]>
2626
* @author Johannes M. Schmitt <[email protected]>

0 commit comments

Comments
 (0)