Merge branch '4.1' into 4.2
* 4.1: [HttpKernel] fix nested calls to serialize when using DataCollector
This commit is contained in:
commit
fac1052038
@ -36,12 +36,15 @@ abstract class DataCollector implements DataCollectorInterface, \Serializable
|
|||||||
|
|
||||||
public function serialize()
|
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)
|
public function unserialize($data)
|
||||||
{
|
{
|
||||||
$this->data = unserialize($data);
|
$this->data = \is_array($data) ? $data : unserialize($data);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user