4 Commits

Author	SHA1	Message	Date
Fabien Potencier	bdc7e91865	Merge branch '2.0' into 2.1 ... * 2.0: [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder [Security] PHPDoc in SecurityEvents [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737) [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786) [Yaml] fixed #6773 [Yaml] fixed #6770 bumped Symfony version to 2.0.23-DEV Conflicts: src/Symfony/Component/DependencyInjection/ContainerBuilder.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Yaml/Inline.php src/Symfony/Component/Yaml/Tests/InlineTest.php	2013-01-22 08:14:57 +01:00
Fabien Potencier	d100ffaf76	fixed CS	2012-07-09 14:54:20 +02:00
avorobiev	19bdae1b90	[DependencyInjection] Fixed unescaping of class arguments	2012-07-02 18:10:38 +04:00
Fabien Potencier	fea6b79acd	moved component and bridge unit tests to the src/ directory ... This is the first step to make each Symfony Component and Bridge self-contained.	2012-03-29 08:37:22 +02:00