Skip to content

Commit a486200

Browse files
Merge branch '4.4' into 5.0
* 4.4: (28 commits) bug #34554 [HttpClient] Fix early cleanup of pushed HTTP/2 responses (lyrixx) Fix tests [Console] Fix commands description with numeric namespaces [HttpFoundation] Fixed typo [DI] Skip unknown method calls for factories in check types pass [EventDispatcher] Better error reporting when arguments to dispatch() are swapped improve upgrade instructions for twig.exception_controller configuration [HttpFoundation] Update CHANGELOG for PdoSessionHandler BC BREAK in 4.4 [Serializer] CsvEncoder::NO_HEADERS_KEY ignored when used in constructor [Form] Keep preferred_choices order for choice groups [Debug] work around failing chdir() on Darwin [PhpUnitBridge] Read configuration CLI directive [DI] Missing test on YamlFileLoader Revert "minor #34608 [Process] add tests for php executable finder if file does not exist (ahmedash95)" Simpler example for Apache basic auth workaround [Console] Fix trying to access array offset on value of type int [Config] Remove extra sprintf arg [HttpKernel] fix typo [HttpKernel] Support typehint to deprecated FlattenException in controller Add preview mode support for Html and Serializer error renderers ...
2 parents 956b8b6 + 0a89a1d commit a486200

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Dumper/ContextProvider/SourceContextProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public function getContext(): ?array
5252
&& 'dump' === $trace[$i]['function']
5353
&& VarDumper::class === $trace[$i]['class']
5454
) {
55-
$file = $trace[$i]['file'];
56-
$line = $trace[$i]['line'];
55+
$file = $trace[$i]['file'] ?? $file;
56+
$line = $trace[$i]['line'] ?? $line;
5757

5858
while (++$i < $this->limit) {
5959
if (isset($trace[$i]['function'], $trace[$i]['file']) && empty($trace[$i]['class']) && 0 !== strpos($trace[$i]['function'], 'call_user_func')) {

0 commit comments

Comments
 (0)