Merge branch '3.4' into 4.1

nicolas-grekas · nicolas-grekas · commit 29874bc397e7 · 2019-01-29T11:03:57.000+01:00
* 3.4:
  [HttpKernel] fix nested calls to serialize when using DataCollector
diff --git a/DataCollector/DataCollector.php b/DataCollector/DataCollector.php
@@ -36,12 +36,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
`@@ -36,12 +36,15 @@ abstract class DataCollector implements DataCollectorInterface, \Serializable`
`36`	`36`
`37`	`37`	`public function serialize()`
`38`	`38`	`{`
`39`		`- return serialize($this->data);`
	`39`	`+ $trace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 2);`
	`40`	`+ $isCalledFromOverridingMethod = isset($trace[1]['function'], $trace[1]['object']) && 'serialize' === $trace[1]['function'] && $this === $trace[1]['object'];`
	`41`	`+`
	`42`	`+ return $isCalledFromOverridingMethod ? $this->data : serialize($this->data);`
`40`	`43`	`}`
`41`	`44`
`42`	`45`	`public function unserialize($data)`
`43`	`46`	`{`
`44`		`- $this->data = unserialize($data);`
	`47`	`+ $this->data = \is_array($data) ? $data : unserialize($data);`
`45`	`48`	`}`
`46`	`49`
`47`	`50`	`/**`