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 |
|
