Skip to content

Commit 6233098

Browse files
committed
Merge branch '2.3' into 2.6
* 2.3: [Validator] Add missing pt_BR translations Add parsing of hexadecimal strings for PHP 7 [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition [Validator] Added missing Hungarian translation [Validator] Fixed grammar in Hungarian translation CS: Unary operators should be placed adjacent to their operands CS: Binary operators should be arounded by at least one space remove useless tests that fail in php 7 [Translator] fix test for php 7 compatibility Update phpdoc of ProcessBuilder#setPrefix() Conflicts: src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php src/Symfony/Component/PropertyAccess/PropertyAccessor.php src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf src/Symfony/Component/Yaml/Parser.php
2 parents a74927d + 065335c commit 6233098

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Form/Type/DoctrineType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
6060

6161
public function setDefaultOptions(OptionsResolverInterface $resolver)
6262
{
63-
$choiceListCache = & $this->choiceListCache;
63+
$choiceListCache = &$this->choiceListCache;
6464
$registry = $this->registry;
6565
$propertyAccessor = $this->propertyAccessor;
6666
$type = $this;

Tests/Logger/DbalLoggerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function testLogLongString()
8787
$testString = 'abc';
8888

8989
$shortString = str_pad('', DbalLogger::MAX_STRING_LENGTH, $testString);
90-
$longString = str_pad('', DbalLogger::MAX_STRING_LENGTH+1, $testString);
90+
$longString = str_pad('', DbalLogger::MAX_STRING_LENGTH + 1, $testString);
9191

9292
$dbalLogger
9393
->expects($this->once())

0 commit comments

Comments
 (0)