diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-05-12 17:16:46 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-05-12 17:16:46 +0200 |
| commit | 165c5e5d50896e657ff2b0d1663b4b224ef8294c (patch) | |
| tree | 1091443805aa5cc9017bc149b60ae3b052ef715f /Acl/Model/ObjectIdentityRetrievalStrategyInterface.php | |
| parent | 91520c37bd5317989094f5f9305ba0ce1c9a968f (diff) | |
| parent | 69aa8266619387ed128df04d9909e8eda7e2e866 (diff) | |
| download | symfony-security-165c5e5d50896e657ff2b0d1663b4b224ef8294c.zip symfony-security-165c5e5d50896e657ff2b0d1663b4b224ef8294c.tar.gz symfony-security-165c5e5d50896e657ff2b0d1663b4b224ef8294c.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7: (70 commits)
[travis] Use container-based infrastructure
[HttpKernel] use ConfigCache::getPath() method when it exists
[PropertyAccess] Fix setting public property on a class having a magic getter
[Routing] Display file which contain deprecated option
ContainerInterface: unused exception dropped
bumped Symfony version to 2.6.8
updated VERSION for 2.6.7
updated CHANGELOG for 2.6.7
bumped Symfony version to 2.3.29
updated VERSION for 2.3.28
update CONTRIBUTORS for 2.3.28
updated CHANGELOG for 2.3.28
[Debug] Fixed ClassNotFoundFatalErrorHandlerTest
[SecurityBundle] use access decision constants in config
[SecurityBundle] use session auth constants in config
PhpDoc fix in AbstractRememberMeServices
[Filesystem] Simplified an if statement
[SecurityBundle] Use Enum Nodes Instead Of Scalar
[Debug 2.3] Fix test for PHP7
[HttpKernel] Check if "symfony/proxy-manager-bridge" package is installed
...
Conflicts:
src/Symfony/Bundle/DebugBundle/composer.json
src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
src/Symfony/Component/Form/README.md
src/Symfony/Component/Intl/README.md
src/Symfony/Component/Security/README.md
src/Symfony/Component/Translation/Loader/CsvFileLoader.php
src/Symfony/Component/Translation/Loader/IniFileLoader.php
src/Symfony/Component/Translation/Loader/MoFileLoader.php
src/Symfony/Component/Translation/Loader/PhpFileLoader.php
src/Symfony/Component/Translation/Loader/PoFileLoader.php
src/Symfony/Component/Translation/Loader/YamlFileLoader.php
src/Symfony/Component/Translation/README.md
src/Symfony/Component/Translation/Translator.php
src/Symfony/Component/Validator/README.md
Diffstat (limited to 'Acl/Model/ObjectIdentityRetrievalStrategyInterface.php')
0 files changed, 0 insertions, 0 deletions