[HttpKernel] fix nested calls to serialize when using DataCollector

nicolas-grekas · nicolas-grekas · commit 3cfb558f03b7 · 2019-01-29T11:03:44.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
@@ -42,12 +42,15 @@ abstract class DataCollector implements DataCollectorInterface, \Serializable
 
     public function serialize()
     {
-        return serialize($this->data);
+        $trace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 2);
+        $isCalledFromOverridingMethod = isset($trace[1]['function'], $trace[1]['object']) && 'serialize' === $trace[1]['function'] && $this === $trace[1]['object'];
+
+        return $isCalledFromOverridingMethod ? $this->data : serialize($this->data);
     }
 
     public function unserialize($data)
     {
-        $this->data = unserialize($data);
+        $this->data = \is_array($data) ? $data : unserialize($data);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,15 @@ abstract class DataCollector implements DataCollectorInterface, \Serializable`
`42`	`42`
`43`	`43`	`public function serialize()`
`44`	`44`	`{`
`45`		`- return serialize($this->data);`
	`45`	`+ $trace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 2);`
	`46`	`+ $isCalledFromOverridingMethod = isset($trace[1]['function'], $trace[1]['object']) && 'serialize' === $trace[1]['function'] && $this === $trace[1]['object'];`
	`47`	`+`
	`48`	`+ return $isCalledFromOverridingMethod ? $this->data : serialize($this->data);`
`46`	`49`	`}`
`47`	`50`
`48`	`51`	`public function unserialize($data)`
`49`	`52`	`{`
`50`		`- $this->data = unserialize($data);`
	`53`	`+ $this->data = \is_array($data) ? $data : unserialize($data);`
`51`	`54`	`}`
`52`	`55`
`53`	`56`	`/**`