diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-03 07:23:50 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-03 07:23:50 +0200 |
| commit | f70d3420f4f5bdb9b98ce3c880c7fcd8ccc46918 (patch) | |
| tree | 45838e66f8c51d95d890b301af28205cfd72f406 /Core/Encoder/EncoderFactory.php | |
| parent | 75a7667fefc83c8625302983ddf4237a0a966baf (diff) | |
| parent | 11c6ba069dbe07aa890760544e38585581a2ee6e (diff) | |
| download | symfony-security-f70d3420f4f5bdb9b98ce3c880c7fcd8ccc46918.zip symfony-security-f70d3420f4f5bdb9b98ce3c880c7fcd8ccc46918.tar.gz symfony-security-f70d3420f4f5bdb9b98ce3c880c7fcd8ccc46918.tar.bz2 | |
Merge branch '2.3' into 2.4v2.5.0-BETA1
* 2.3:
Revert PHPUnit version, revert APC configuration
removed APC on the CLI for Travis as it does not work well with PHPUnit and Composer anyway
[Security] Replace exception mocks with actual exception instances.
Remove an unused argument.
Use `Filesystem::chmod` instead of `chmod` when dumping file
[Form] Added test for disabling buttons
[Form] Added check for parent disabled status in Button form elements
Fixes URL validator to accept single part urls
tweaked Travis configuration to get more tests running
fixed float comparison in unit tests for HHVM
upgraded PHPUnit to version 4 for better HHVM support
[Process] fixed HHVM usage on the CLI
Fix class names in ApcUniversalClassLoader tests.
fixed the profiler when an uncalled listener throws an exception when instantiated
fixed CS
Added test case for 4c6a2d15095c13b2a35751b2b2712b183be489c4
Fixed bug in ChoiceType triggering a warning when not using utf-8
fixed CS
Avoid levenshtein comparison when using ContainerBuilder.
Conflicts:
src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
Diffstat (limited to 'Core/Encoder/EncoderFactory.php')
0 files changed, 0 insertions, 0 deletions