Nicolas Grekas
|
0191aa24bb
|
Merge branch '2.3' into 2.6
* 2.3:
[Routing][DependencyInjection] Support .yaml extension in YAML loaders
[DX] improve file loader error for router/other resources in bundle
[FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
[HttpKernel] Cleanup ExceptionListener
CS fixes
[DependencyInjection] Show better error when the Yaml component is not installed
[2.3] SCA for Components - reference mismatches
[2.3] Static Code Analysis for Components
[Translation][fixed test] refresh cache when resources are no longer fresh.
[Validator] Added missing Simplified Chinese (zh_CN) translations
[FrameworkBundle] Workaround php -S ignoring auto_prepend_file
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
src/Symfony/Component/Console/Descriptor/TextDescriptor.php
src/Symfony/Component/Console/Helper/TableHelper.php
src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
src/Symfony/Component/PropertyAccess/PropertyAccessor.php
src/Symfony/Component/Yaml/Tests/InlineTest.php
|
2015-04-18 17:02:51 +02:00 |
|
Fabien Potencier
|
05815adb22
|
Merge branch '2.5'
* 2.5:
added missing use statements
added missing use statement
added missing use statement
fixed CS
[Process] fixed some volatile tests
[HttpKernel] fixed a volatile test
[HttpFoundation] fixed some volatile tests
[Tests] PHPUnit Optimizations
Use getPathname() instead of string casting to get BinaryFileReponse file path
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php
src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
src/Symfony/Component/Process/Process.php
src/Symfony/Component/Stopwatch/Stopwatch.php
src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php
src/Symfony/Component/Yaml/Parser.php
src/Symfony/Component/Yaml/Tests/InlineTest.php
|
2014-09-22 13:59:59 +02:00 |
|
Jan Decavele
|
0459d89905
|
Addition of the symfony license text
|
2014-07-22 14:43:43 +02:00 |
|
Tom Van Looy
|
de43182e0d
|
Add test and small code fix
|
2014-07-09 10:11:37 +02:00 |
|