8000 Merge branch '3.4' into 4.2 · symfony/symfony@87f3c36 · GitHub
[go: up one dir, main page]
Skip to content

Commit 87f3c36

Browse files
nicolas-grekasnicolas-grekas
committed
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 8ac69b9 + b0a3208 commit 87f3c36

File tree

145 files changed

+887
-287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+887
-287
lines changed

‎UPGRADE-4.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ DependencyInjection
230230
supported.
231231

232232
* The ``strict`` attribute in service arguments has been removed.
233-
The attribute is ignored since 3.0, so you can simply remove it.
233+
The attribute is ignored since 3.0, you can remove it.
234234

235235
* Top-level anonymous services in XML are no longer supported.
236236

‎src/Symfony/Bridge/Doctrine/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 <david@liip.ch>

‎src/Symfony/Bridge/Doctrine/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

‎src/Symfony/Bridge/Doctrine/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 <fabien@symfony.com>
2626
* @author Johannes M. Schmitt <schmittjoh@gmail.com>

‎src/Symfony/Bridge/Monolog/Handler/FingersCrossed/HttpCodeActivationStrategy.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ class HttpCodeActivationStrategy extends ErrorLevelActivationStrategy
3131
public function __construct(RequestStack $requestStack, array $exclusions, $actionLevel)
3232
{
3333
foreach ($exclusions as $exclusion) {
34-
if (!array_key_exists('code', $exclusion)) {
34+
if (!\array_key_exists('code', $exclusion)) {
3535
throw new \LogicException(sprintf('An exclusion must have a "code" key'));
3636
}
37-
if (!array_key_exists('urls', $exclusion)) {
37+
if (!\array_key_exists('urls', $exclusion)) {
3838
throw new \LogicException(sprintf('An exclusion must have a "urls" key'));
3939
}
4040
}

‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures/proxy-factory.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?php
22

3-
return new class
4-
{
3+
return new class() {
54
public $proxyClass;
65
private $privates = [];
76

‎src/Symfony/Bridge/Twig/NodeVisitor/Scope.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function set($key, $value)
7777
*/
7878
public function has($key)
7979
{
80-
if (array_key_exists($key, $this->data)) {
80+
if (\array_key_exists($key, $this->data)) {
8181
return true;
8282
}
8383

@@ -98,7 +98,7 @@ public function has($key)
9898
*/
9999
public function get($key, $default = null)
100100
{
101-
if (array_key_exists($key, $this->data)) {
101+
if (\array_key_exists($key, $this->data)) {
102102
return $this->data[$key];
103103
}
104104

‎src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ private function getConfigForPath(array $config, string $path, string $alias)
138138
$steps = explode('.', $path);
139139

140140
foreach ($steps as $step) {
141-
if (!array_key_exists($step, $config)) {
141+
if (!\array_key_exists($step, $config)) {
142142
throw new LogicException(sprintf('Unable to find configuration for "%s.%s"', $alias, $path));
143143
}
144144

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI
227227
return $builder->getDefinition($serviceId);
228228
}
229229

230-
// Some service IDs don't have a Definition, they're simply an Alias
230+
// Some service IDs don't have a Definition, they're aliases
231231
if ($builder->hasAlias($serviceId)) {
232232
return $builder->getAlias($serviceId);
233233
}

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ protected function describeContainerAlias(Alias $alias, array $options = [], Con
156156
*/
157157
protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = [])
158158
{
159-
$this->writeData($this->getEventDispatcherListenersData($eventDispatcher, array_key_exists('event', $options) ? $options['event'] : null), $options);
159+
$this->writeData($this->getEventDispatcherListenersData($eventDispatcher, \array_key_exists('event', $options) ? $options['event'] : null), $options);
160160
}
161161

162162
/**

0 commit comments

Comments
 (0)
0