Skip to content

Commit b9008df

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: [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/Bridge/Propel1/Logger/PropelLogger.php src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf
2 parents c9e68c7 + 8e90070 commit b9008df

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
@@ -1484,14 +1484,14 @@ private function getNextVariableName()
14841484
$i = $this->variableCount;
14851485

14861486
if ('' === $name) {
1487-
$name .= $firstChars[$i%$firstCharsLength];
1488-
$i = (int) ($i/$firstCharsLength);
1487+
$name .= $firstChars[$i % $firstCharsLength];
1488+
$i = (int) ($i / $firstCharsLength);
14891489
}
14901490

14911491
while ($i > 0) {
14921492
--$i;
1493-
$name .= $nonFirstChars[$i%$nonFirstCharsLength];
1494-
$i = (int) ($i/$nonFirstCharsLength);
1493+
$name .= $nonFirstChars[$i % $nonFirstCharsLength];
1494+
$i = (int) ($i / $nonFirstCharsLength);
14951495
}
14961496

14971497
++$this->variableCount;

0 commit comments

Comments
 (0)