diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-01-03 16:23:51 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-01-03 16:23:51 +0100 |
| commit | 3c08afb6d3cacf22c9799bfb0f08c3235ef38cd6 (patch) | |
| tree | 7d51e93b2ff5e382921803e326452f462df0eb57 /Core/Tests/Encoder/BasePasswordEncoderTest.php | |
| parent | 99eaad2b772342dd09fd0498340bc2a675644082 (diff) | |
| parent | 0e0bddb6cd3fda22a89662fd2476d05f11d10fef (diff) | |
| download | symfony-security-3c08afb6d3cacf22c9799bfb0f08c3235ef38cd6.zip symfony-security-3c08afb6d3cacf22c9799bfb0f08c3235ef38cd6.tar.gz symfony-security-3c08afb6d3cacf22c9799bfb0f08c3235ef38cd6.tar.bz2 | |
Merge branch '2.3' into 2.5
* 2.3:
[2.3] Remove useless tests skips
[2.3] Cleanup deprecations
Conflicts:
src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/TwigBundle/composer.json
src/Symfony/Component/Debug/Tests/MockExceptionHandler.php
src/Symfony/Component/Debug/composer.json
src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
src/Symfony/Component/HttpKernel/composer.json
src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
src/Symfony/Component/Security/Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php
src/Symfony/Component/Security/composer.json
Diffstat (limited to 'Core/Tests/Encoder/BasePasswordEncoderTest.php')
0 files changed, 0 insertions, 0 deletions