mirrors/barryvdh_ReflectionDocBlock
1
0
Fork 0
mirror of https://github.com/barryvdh/ReflectionDocBlock.git synced 2026-08-18 01:57:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #205 from remicollet/issue-74

Browse Source 
don't rely on 'args' in trace, not available in 7.4
This commit is contained in:
Jaap van Otterdijk
2020-02-12 19:13:16 +01:00
committed by GitHub
parent 50e77ace68 e8384e45fa
commit 49a9955ef6
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/DocBlock/Tags/InvalidTag.php
+10 -10
View File
@@ -102,16 +102,16 @@ final class InvalidTag implements Tag
};
do {
$trace = array_map(
static function (array $call) use ($flatten) : array {
$call['args'] = $call['args'] ?? [];
array_walk_recursive($call['args'], $flatten);
return $call;
},
$exception->getTrace()
);
$trace = $exception->getTrace();
if (isset($trace[0]['args'])) {
$trace = array_map(
static function (array $call) use ($flatten) : array {
array_walk_recursive($call['args'], $flatten);
return $call;
},
$trace
);
}
$traceProperty->setValue($exception, $trace);
$exception = $exception->getPrevious();
} while ($exception !== null);
tests/unit/DocBlock/Tags/InvalidTagTest.php
+12 -6
View File
@@ -56,8 +56,11 @@ final class InvalidTagTest extends TestCase
self::assertSame('name', $tag->getName());
self::assertSame('@name Body', $tag->render());
self::assertSame($parentException, $tag->getException());
self::assertStringStartsWith('(Closure at', $tag->getException()->getPrevious()->getTrace()[0]['args'][0]);
self::assertStringContainsString(__FILE__, $tag->getException()->getPrevious()->getTrace()[0]['args'][0]);
$trace = $tag->getException()->getPrevious()->getTrace();
if (isset($trace[0]['args'])) { // Not set by default on 7.4
self::assertStringStartsWith('(Closure at', $trace[0]['args'][0]);
self::assertStringContainsString(__FILE__, $trace[0]['args'][0]);
}
self::assertEquals($parentException, unserialize(serialize($parentException)));
}
}
@@ -81,10 +84,13 @@ final class InvalidTagTest extends TestCase
self::assertSame('name', $tag->getName());
self::assertSame('@name Body', $tag->render());
self::assertSame($parentException, $tag->getException());
self::assertStringStartsWith(
'resource(stream)',
$tag->getException()->getPrevious()->getTrace()[0]['args'][0]
);
$trace = $tag->getException()->getPrevious()->getTrace();
if (isset($trace[0]['args'])) { // Not set by default on 7.4
self::assertStringStartsWith(
'resource(stream)',
$trace[0]['args'][0]
);
}
self::assertEquals($parentException, unserialize(serialize($parentException)));
}
}