This repository has been archived on 2023-08-20. You can view files and clone it, but cannot push or open issues or pull requests.

Fabien Potencier f1d2fe9d5d Merge branch '2.0' into 2.1 ... * 2.0: Restrict Monolog version to be in version <1.3 [Console] Make getTerminalWith & getTerminalHeight public [DependencyInjection] fixed PhpDumper optimizations when an inlined service depends on the current one indirectly [DependencyInjection] fixed PhpDumper when an inlined service definition has some properties [DependencyInjection] added some tests for PhpDumper when the container is compiled [DependencyInjection] fixed CS [Locale] Adjust `StubIntlDateFormatter` to have new methods added in PHP 5.5 [Locale] Fix failing `StubIntlDateFormatter` tests in PHP 5.5 [Locale] Fix failing `StubIntlDateFormatter` in PHP 5.5 [Form] Fix failing `MonthChoiceList` in PHP 5.5 Update .travis.yml Conflicts: src/Symfony/Bridge/Monolog/composer.json src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php tests/Symfony/Tests/Component/DependencyInjection/Fixtures/yaml/services9.yml		2013-01-05 16:31:25 +01:00
..
GraphvizDumperTest.php	fixed CS	2012-07-09 14:54:20 +02:00
PhpDumperTest.php	Merge branch '2.0' into 2.1	2013-01-05 16:31:25 +01:00
XmlDumperTest.php	fixed CS	2012-07-09 14:54:20 +02:00
YamlDumperTest.php	fixed CS	2012-07-09 14:54:20 +02:00