diff --git a/src/Symfony/Component/Serializer/Debug/TraceableSerializer.php b/src/Symfony/Component/Serializer/Debug/TraceableSerializer.php
index dd22e8678e782..964fd75031833 100644
--- a/src/Symfony/Component/Serializer/Debug/TraceableSerializer.php
+++ b/src/Symfony/Component/Serializer/Debug/TraceableSerializer.php
@@ -179,8 +179,8 @@ private function getCaller(string $method, string $interface): array
&& $method === $trace[$i]['function']
&& is_a($trace[$i]['class'], $interface, true)
) {
- $file = $trace[$i]['file'];
- $line = $trace[$i]['line'];
+ $file = $trace[$i]['file'] ?? $trace[$i + 1]['file'];
+ $line = $trace[$i]['line'] ?? $trace[$i + 1]['line'];
break;
}
diff --git a/src/Symfony/Component/Serializer/Tests/Debug/TraceableSerializerTest.php b/src/Symfony/Component/Serializer/Tests/Debug/TraceableSerializerTest.php
index ea3c851c6040b..dc6e4a6b7a1b6 100644
--- a/src/Symfony/Component/Serializer/Tests/Debug/TraceableSerializerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Debug/TraceableSerializerTest.php
@@ -126,6 +126,40 @@ public function testAddDebugTraceIdInContext()
$traceableSerializer->encode('data', 'format');
$traceableSerializer->decode('data', 'format');
}
+
+ public function testCollectedCaller()
+ {
+ $serializer = new \Symfony\Component\Serializer\Serializer();
+
+ $collector = new SerializerDataCollector();
+ $traceableSerializer = new TraceableSerializer($serializer, $collector);
+
+ $traceableSerializer->normalize('data');
+ $collector->lateCollect();
+
+ $this->assertSame([
+ 'name' => 'TraceableSerializerTest.php',
+ 'file' => __FILE__,
+ 'line' => __LINE__ - 6,
+ ], $collector->getData()['normalize'][0]['caller']);
+ }
+
+ public function testCollectedCallerFromArrayMap()
+ {
+ $serializer = new \Symfony\Component\Serializer\Serializer();
+
+ $collector = new SerializerDataCollector();
+ $traceableSerializer = new TraceableSerializer($serializer, $collector);
+
+ array_map([$traceableSerializer, 'normalize'], ['data']);
+ $collector->lateCollect();
+
+ $this->assertSame([
+ 'name' => 'TraceableSerializerTest.php',
+ 'file' => __FILE__,
+ 'line' => __LINE__ - 6,
+ ], $collector->getData()['normalize'][0]['caller']);
+ }
}
class Serializer implements SerializerInterface, NormalizerInterface, DenormalizerInterface, EncoderInterface, DecoderInterface
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy