diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2014-12-12 17:21:40 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2014-12-12 17:21:40 +0100 |
| commit | 89deef8fb9e2d53ca9cc6cdef277052db4c9587d (patch) | |
| tree | 072ea8d5a2e469a63592b086c634ee7d3a493e9e /Core/Tests/Encoder/UserPasswordEncoderTest.php | |
| parent | fa7f23f270c874a5b53e9b96ac46274c73986322 (diff) | |
| parent | 9b949283bf2eda8a49a8771eae8e1618515f9358 (diff) | |
| download | symfony-security-89deef8fb9e2d53ca9cc6cdef277052db4c9587d.zip symfony-security-89deef8fb9e2d53ca9cc6cdef277052db4c9587d.tar.gz symfony-security-89deef8fb9e2d53ca9cc6cdef277052db4c9587d.tar.bz2 | |
Merge branch '2.5' into 2.6
* 2.5:
[Form] fixed a maxlength overring on a guessing
[Debug] Show only unique class candidates
[SecurityBundle] Firewall providers building - code cleaning
[Filesystem] symlink use RealPath instead LinkTarget
[DependencyInjection] Remove duplicate declaration in PhpDumper
terminals are not interactive on Travis
Revert "[DependencyInjection] backport perf optim"
[WebProfilerBundle] replaced pattern to path attribute in routes definitions.
fix phpdoc's alignment
Fixed the AuthenticationProviderInterface alignment
Fixed the proxy-manager version constraint
[FrameworkBundle][Template name] avoid error message for the shortcut notation.
[DependencyInjection] perf optim: call dirname() at most 5x
[DependencyInjection] backport perf optim
Fixed #12845 adding a listener to an event that is currently being dispatched will not result into a fatal error in TraceableEventDispatcher [EventDispatcher]
[2.5] Remove possible call_user_func()
[2.3] Remove possible call_user_func()
Conflicts:
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
Diffstat (limited to 'Core/Tests/Encoder/UserPasswordEncoderTest.php')
0 files changed, 0 insertions, 0 deletions