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
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
..
BrowserKit Merge branch '2.0' into 2.1 2013-01-04 18:00:54 +01:00
ClassLoader Merge branch '2.0' into 2.1 2013-01-04 18:00:54 +01:00
Config Merge branch '2.0' into 2.1 2013-01-04 18:00:54 +01:00
Console Merge branch '2.1' 2013-01-05 16:33:05 +01:00
CssSelector Merge branch '2.0' into 2.1 2013-01-04 18:00:54 +01:00
DependencyInjection Merge branch '2.1' 2013-01-05 16:33:05 +01:00
DomCrawler Merge branch '2.0' into 2.1 2013-01-04 18:00:54 +01:00
EventDispatcher Merge branch '2.1' 2013-01-04 18:02:19 +01:00
Filesystem Merge branch '2.0' into 2.1 2013-01-04 18:00:54 +01:00
Finder Merge branch '2.0' into 2.1 2013-01-04 18:00:54 +01:00
Form merged branch stloyd/feature/travis_php55 (PR #6552) 2013-01-04 18:25:14 +01:00
HttpFoundation Merge branch '2.1' 2013-01-04 18:02:19 +01:00
HttpKernel Merge branch '2.0' into 2.1 2013-01-04 18:00:54 +01:00
Locale Merge branch '2.1' 2013-01-05 16:33:05 +01:00
OptionsResolver Merge branch '2.0' into 2.1 2013-01-04 18:00:54 +01:00
Process Merge branch '2.1' 2013-01-05 16:33:05 +01:00
Routing Merge branch '2.0' into 2.1 2013-01-04 18:00:54 +01:00
Security Merge branch '2.1' 2013-01-05 16:33:05 +01:00
Serializer Merge branch '2.0' into 2.1 2013-01-04 18:00:54 +01:00
Stopwatch updated license year 2013-01-04 17:58:00 +01:00
Templating Merge branch '2.0' into 2.1 2013-01-04 18:00:54 +01:00
Translation Merge branch '2.0' into 2.1 2013-01-04 18:00:54 +01:00
Validator Merge branch '2.1' 2013-01-04 18:02:19 +01:00
Yaml Merge branch '2.0' into 2.1 2013-01-04 18:00:54 +01:00