diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
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.
0b4716e3e8
symfony/src/Symfony/Component
History
Fabien Potencier 0b4716e3e8 Merge branch '2.1' into 2.2 
* 2.1:
  [DependencyInjection] fixed wrong exception class

Conflicts:
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
2013-04-17 14:12:09 +02:00
..
BrowserKit Merge branch '2.1' into 2.2 2013-03-15 11:14:31 +01:00
ClassLoader [ClassLoader] fixed heredocs handling 2013-03-19 09:32:26 +01:00
Config fixed CS 2013-03-01 11:42:10 +01:00
Console Merge branch '2.1' into 2.2 2013-04-17 07:27:14 +02:00
CssSelector Merge branch '2.1' 2013-01-17 16:25:59 +01:00
DependencyInjection Merge branch '2.1' into 2.2 2013-04-17 14:12:09 +02:00
DomCrawler merge branch '2.1' into 2.2 2013-04-01 10:05:23 +02:00
EventDispatcher Merge branch '2.1' into 2.2 2013-02-11 12:26:43 +01:00
Filesystem Merge branch '2.1' 2013-01-17 16:25:59 +01:00
Finder On OS X, sys_get_tmp_dir() returns /var/private/..., which really is below /private/var. 2013-04-01 09:51:50 +02:00
Form Merge branch '2.1' into 2.2 2013-04-17 07:27:14 +02:00
HttpFoundation Merge branch '2.1' into 2.2 2013-04-17 07:27:14 +02:00
HttpKernel Merge branch '2.1' into 2.2 2013-04-17 07:27:14 +02:00
Locale Update composer.json files: - to allow versions ~2.2 (>=2.2,<3.0) of Doctrine DBAL, ORM & Common - fixed Propel1 versions difference between main and bridge files - fixed Twig versions difference between main and bridge files - to allow versions ~1.11 (>=1.11,<2.0) of Twig - fixed Locale ext-intl version to accept all, not non-existing version 2013-02-01 10:33:53 +01:00
OptionsResolver Merge branch '2.1' 2013-01-17 16:25:59 +01:00
Process Merge branch '2.1' into 2.2 2013-04-07 22:19:55 +02:00
PropertyAccess [PropertyAccess] Add objectives to pluralMap 2013-04-08 00:02:49 +02:00
Routing Merge branch '2.1' into 2.2 2013-04-17 07:27:14 +02:00
Security merged branch lyrixx/path-10 (PR #7597) 2013-04-08 16:57:30 +02:00
Serializer Fix warning for buildXml method 2013-03-06 22:43:23 +01:00
Stopwatch updated license year 2013-01-04 17:58:00 +01:00
Templating Merge branch '2.1' into 2.2 2013-04-17 07:27:14 +02:00
Translation fixed doc references (closes #7515) 2013-04-01 10:06:05 +02:00
Validator fixed doc references (closes #7515) 2013-04-01 10:06:05 +02:00
Yaml Merge branch '2.1' into 2.2 2013-04-17 07:27:14 +02:00