fix merge
This commit is contained in:
parent
1acb50e0a4
commit
23d8fc761b
@ -143,25 +143,6 @@ abstract class AbstractToken implements TokenInterface
|
|||||||
return [$this->user, $this->authenticated, null, $this->attributes, $this->roleNames];
|
return [$this->user, $this->authenticated, null, $this->attributes, $this->roleNames];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* {@inheritdoc}
|
|
||||||
*
|
|
||||||
* @final since Symfony 4.3, use __serialize() instead
|
|
||||||
*
|
|
||||||
* @internal since Symfony 4.3, use __serialize() instead
|
|
||||||
*/
|
|
||||||
public function serialize()
|
|
||||||
{
|
|
||||||
$serialized = $this->__serialize();
|
|
||||||
|
|
||||||
if (null === $isCalledFromOverridingMethod = \func_num_args() ? func_get_arg(0) : null) {
|
|
||||||
$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 ? $serialized : serialize($serialized);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Restores the object state from an array given by __serialize().
|
* Restores the object state from an array given by __serialize().
|
||||||
*
|
*
|
||||||
|
Reference in New Issue
Block a user