diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-07-20 09:42:02 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-07-20 09:42:02 +0200 |
| commit | fe2f6100bba95f9bc77ab93bfc0dcda064cfa780 (patch) | |
| tree | 01eeb1225d199d24a065573ea6d1aa41bb5da3cb /Tests/Core/Authentication/Token/AbstractTokenTest.php | |
| parent | c8fe51a2773aade162b8dbe634a185f9b92d875d (diff) | |
| parent | 73f4ea78eb4af288880ea99482f2542fa04b6c64 (diff) | |
| download | symfony-security-fe2f6100bba95f9bc77ab93bfc0dcda064cfa780.zip symfony-security-fe2f6100bba95f9bc77ab93bfc0dcda064cfa780.tar.gz symfony-security-fe2f6100bba95f9bc77ab93bfc0dcda064cfa780.tar.bz2 | |
Merge branch '2.2' into 2.3
* 2.2:
[PropertyAccess] added moves to pluralMap
[Security] fixed issue where authentication listeners clear unrelated tokens
fix issue #8499 modelChoiceList call getPrimaryKey on a non object
[DependencyInjection] Add exception for service name not dumpable in PHP
Conflicts:
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
src/Symfony/Component/Security/Tests/Http/Firewall/BasicAuthenticationListenerTest.php
Diffstat (limited to 'Tests/Core/Authentication/Token/AbstractTokenTest.php')
0 files changed, 0 insertions, 0 deletions