diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' into 4.4

Browse Source 
* 3.4:
  [PhpUnitBridge] fix PHP 5.3 compat
  [PhpUnitBridge] Mark parent class also covered in CoverageListener
  prevent notice for invalid octal numbers on PHP 7.4
This commit is contained in:
Nicolas Grekas 2020-05-05 09:39:02 +02:00
commit 2732dda83c
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php
View File

@ -69,10 +69,19 @@ class CoverageListenerTrait
$r = new \ReflectionProperty(Test::class, 'annotationCache');
$r->setAccessible(true);
$covers = $sutFqcn;
if (!\is_array($sutFqcn)) {
$covers = [$sutFqcn];
while ($parent = get_parent_class($sutFqcn)) {
$covers[] = $parent;
$sutFqcn = $parent;
}
}
$cache = $r->getValue();
$cache = array_replace_recursive($cache, [
\get_class($test) => [
'covers' => \is_array($sutFqcn) ? $sutFqcn : [$sutFqcn],
'covers' => $covers,
],
]);
$r->setValue(Test::class, $cache);

14
src/Symfony/Component/Yaml/Inline.php
View File

@ -636,15 +636,21 @@ class Inline
switch (true) {
case ctype_digit($scalar):
$raw = $scalar;
if ('0' === $scalar[0]) {
return octdec(preg_replace('/[^0-7]/', '', $scalar));
}
$cast = (int) $scalar;
return '0' == $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw);
return ($scalar === (string) $cast) ? $cast : $scalar;
case '-' === $scalar[0] && ctype_digit(substr($scalar, 1)):
$raw = $scalar;
if ('0' === $scalar[1]) {
return -octdec(preg_replace('/[^0-7]/', '', substr($scalar, 1)));
}
$cast = (int) $scalar;
return '0' == $scalar[1] ? -octdec(substr($scalar, 1)) : (($raw === (string) $cast) ? $cast : $raw);
return ($scalar === (string) $cast) ? $cast : $scalar;
case is_numeric($scalar):
case Parser::preg_match(self::getHexRegex(), $scalar):
$scalar = str_replace('_', '', $scalar);

10
src/Symfony/Component/Yaml/Tests/InlineTest.php
View File

@ -781,6 +781,16 @@ class InlineTest extends TestCase
];
}
public function testParsePositiveOctalNumberContainingInvalidDigits()
{
self::assertSame(342391, Inline::parse('0123456789'));
}
public function testParseNegativeOctalNumberContainingInvalidDigits()
{
self::assertSame(-342391, Inline::parse('-0123456789'));
}
/**
* @dataProvider unquotedExclamationMarkThrowsProvider
*/