Skip to content

Commit 8e90070

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 75d5498 + 8133862 commit 8e90070

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Dumper/PhpDumper.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1475,14 +1475,14 @@ private function getNextVariableName()
14751475
$i = $this->variableCount;
14761476

14771477
if ('' === $name) {
1478-
$name .= $firstChars[$i%$firstCharsLength];
1479-
$i = (int) ($i/$firstCharsLength);
1478+
$name .= $firstChars[$i % $firstCharsLength];
1479+
$i = (int) ($i / $firstCharsLength);
14801480
}
14811481

14821482
while ($i > 0) {
14831483
--$i;
1484-
$name .= $nonFirstChars[$i%$nonFirstCharsLength];
1485-
$i = (int) ($i/$nonFirstCharsLength);
1484+
$name .= $nonFirstChars[$i % $nonFirstCharsLength];
1485+
$i = (int) ($i / $nonFirstCharsLength);
14861486
}
14871487

14881488
++$this->variableCount;

0 commit comments

Comments
 (0)