Skip to content

Commit

Permalink
prevent notice for invalid octal numbers on PHP 7.4
Browse files Browse the repository at this point in the history
  • Loading branch information
xabbuh committed May 4, 2020
1 parent cfa048c commit 0eb696f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Symfony/Component/Yaml/Inline.php
Expand Up @@ -762,12 +762,12 @@ private static function evaluateScalar($scalar, $flags, $references = [])
$raw = $scalar;
$cast = (int) $scalar;

return '0' == $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw);
return '0' === $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw);
case '-' === $scalar[0] && ctype_digit(substr($scalar, 1)):
$raw = $scalar;
$cast = (int) $scalar;

return '0' == $scalar[1] ? -octdec(substr($scalar, 1)) : (($raw === (string) $cast) ? $cast : $raw);
return '0' === $scalar[1] ? -octdec(substr($scalar, 1)) : (($raw === (string) $cast) ? $cast : $raw);
case is_numeric($scalar):
case Parser::preg_match(self::getHexRegex(), $scalar):
$scalar = str_replace('_', '', $scalar);
Expand Down
10 changes: 10 additions & 0 deletions src/Symfony/Component/Yaml/Tests/InlineTest.php
Expand Up @@ -842,4 +842,14 @@ public function phpConstTagWithEmptyValueProvider()
[['' => 'foo', 'bar' => 'ccc'], '{!php/const : foo, bar: ccc}'],
];
}

public function testParseInvalidPositiveOctalNumber()
{
self::assertSame(342391, Inline::parse('0123456789'));
}

public function testParseInvalidNegativeOctalNumber()
{
self::assertSame(-342391, Inline::parse('-0123456789'));
}
}

0 comments on commit 0eb696f

Please sign in to comment.