This commit is contained in:
Jaapio
2020-02-12 20:14:58 +01:00
parent 50b2bc6670
commit 917b6648e6
2 changed files with 6 additions and 0 deletions
+2
View File
@@ -107,11 +107,13 @@ final class InvalidTag implements Tag
$trace = array_map( $trace = array_map(
static function (array $call) use ($flatten) : array { static function (array $call) use ($flatten) : array {
array_walk_recursive($call['args'], $flatten); array_walk_recursive($call['args'], $flatten);
return $call; return $call;
}, },
$trace $trace
); );
} }
$traceProperty->setValue($exception, $trace); $traceProperty->setValue($exception, $trace);
$exception = $exception->getPrevious(); $exception = $exception->getPrevious();
} while ($exception !== null); } while ($exception !== null);
@@ -57,10 +57,12 @@ final class InvalidTagTest extends TestCase
self::assertSame('@name Body', $tag->render()); self::assertSame('@name Body', $tag->render());
self::assertSame($parentException, $tag->getException()); self::assertSame($parentException, $tag->getException());
$trace = $tag->getException()->getPrevious()->getTrace(); $trace = $tag->getException()->getPrevious()->getTrace();
if (isset($trace[0]['args'])) { // Not set by default on 7.4 if (isset($trace[0]['args'])) { // Not set by default on 7.4
self::assertStringStartsWith('(Closure at', $trace[0]['args'][0]); self::assertStringStartsWith('(Closure at', $trace[0]['args'][0]);
self::assertStringContainsString(__FILE__, $trace[0]['args'][0]); self::assertStringContainsString(__FILE__, $trace[0]['args'][0]);
} }
self::assertEquals($parentException, unserialize(serialize($parentException))); self::assertEquals($parentException, unserialize(serialize($parentException)));
} }
} }
@@ -85,12 +87,14 @@ final class InvalidTagTest extends TestCase
self::assertSame('@name Body', $tag->render()); self::assertSame('@name Body', $tag->render());
self::assertSame($parentException, $tag->getException()); self::assertSame($parentException, $tag->getException());
$trace = $tag->getException()->getPrevious()->getTrace(); $trace = $tag->getException()->getPrevious()->getTrace();
if (isset($trace[0]['args'])) { // Not set by default on 7.4 if (isset($trace[0]['args'])) { // Not set by default on 7.4
self::assertStringStartsWith( self::assertStringStartsWith(
'resource(stream)', 'resource(stream)',
$trace[0]['args'][0] $trace[0]['args'][0]
); );
} }
self::assertEquals($parentException, unserialize(serialize($parentException))); self::assertEquals($parentException, unserialize(serialize($parentException)));
} }
} }