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.
symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures
Fabien Potencier 6250476eaa Merge branch '2.1'
* 2.1:
  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
  [Process] Do not reset stdout/stderr pipes on Interrupted system call
  [Locale] Adjust `StubIntlDateFormatter` to have new methods added in PHP 5.5
  use the right RequestMatcherInterface
  [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
2013-01-05 16:33:05 +01:00
..
containers Merge branch '2.0' into 2.1 2013-01-05 16:31:25 +01:00
graphviz Merge branch '2.0' into 2.1 2013-01-05 16:31:25 +01:00
includes Merge branch '2.0' into 2.1 2013-01-05 16:31:25 +01:00
ini moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00
php Merge branch '2.1' 2013-01-05 16:33:05 +01:00
xml Merge branch '2.0' into 2.1 2013-01-05 16:31:25 +01:00
yaml Merge branch '2.0' into 2.1 2013-01-05 16:31:25 +01:00