diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-12-26 08:59:03 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-12-26 08:59:03 +0100 |
| commit | 0fff311596235f2196f9b36750ff97fbe899ab72 (patch) | |
| tree | cf40680937b020c4495bec0bc3bdd868743af7be /Core/Authentication/Token | |
| parent | e18033c15852f994243dc8c0b1476cd6d1d6c8b3 (diff) | |
| parent | 35c3590ba55c63d2684ff849b1f97fd4a688019c (diff) | |
| download | symfony-security-0fff311596235f2196f9b36750ff97fbe899ab72.zip symfony-security-0fff311596235f2196f9b36750ff97fbe899ab72.tar.gz symfony-security-0fff311596235f2196f9b36750ff97fbe899ab72.tar.bz2 | |
Merge branch '2.3' into 2.4
* 2.3: (31 commits)
Fix parent serialization of user object
[DependencyInjection] fixed typo
add memcache, memcached, and mongodb extensions to run skipped tests
[DependencyInjection] Fixed support for backslashes in service ids.
fix #9356 [Security] Logger should manipulate the user reloaded from provider
[BrowserKit] fixes #8311 CookieJar is totally ignorant of RFC 6265 edge cases
[HttpFoundation] fixed constants that do exist in 2.3 (only in 2.4)
fix 5528 let ArrayNode::normalizeValue respect order of value array provided
fix #7243 allow 0 as arraynode name
Fixed issue in BaseDateTimeTransformer when invalid timezone cause Transformation filed exception (closes #9403).
BinaryFileResponse should also return 416 or 200 on some range-requets
Do normalization on tag options
bumped Symfony version to 2.3.9
updated VERSION for 2.3.8
update CONTRIBUTORS for 2.3.8
updated CHANGELOG for 2.3.8
[Filesystem] Changed the mode for a target file in copy() to be write only.
[Console] fixed CS
fixed TableHelper when cell value has new line
Improved and fixed grammar mistakes. Added pluralized messages
...
Conflicts:
src/Symfony/Component/BrowserKit/Cookie.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/Routing/Matcher/UrlMatcher.php
Diffstat (limited to 'Core/Authentication/Token')
| -rw-r--r-- | Core/Authentication/Token/AbstractToken.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Core/Authentication/Token/AbstractToken.php b/Core/Authentication/Token/AbstractToken.php index e62f73c..59510ee 100644 --- a/Core/Authentication/Token/AbstractToken.php +++ b/Core/Authentication/Token/AbstractToken.php @@ -142,7 +142,14 @@ abstract class AbstractToken implements TokenInterface */ public function serialize() { - return serialize(array($this->user, $this->authenticated, $this->roles, $this->attributes)); + return serialize( + array( + is_object($this->user) ? clone $this->user : $this->user, + $this->authenticated, + $this->roles, + $this->attributes + ) + ); } /** |