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
Nicolas Grekas 78a08f3a68 Merge branch '2.8' into 3.0
* 2.8:
  Fix merge
  [Process] Fix running tests on HHVM>=3.8
  [Form] Improved performance of ChoiceType and its subtypes
  Removed an object as route generator argument

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
	src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
2015-12-30 19:45:14 +01:00
..
Asset Merge branch '2.8' 2015-11-28 12:03:53 +01:00
BrowserKit Merge branch '2.8' into 3.0 2015-12-26 14:39:53 +01:00
ClassLoader Merge branch '2.8' into 3.0 2015-12-28 14:14:56 +01:00
Config Merge branch '2.8' into 3.0 2015-12-28 14:14:56 +01:00
Console Merge branch '2.8' into 3.0 2015-12-28 14:14:56 +01:00
CssSelector Merge branch '2.8' into 3.0 2015-12-05 18:45:07 +01:00
Debug Merge branch '2.8' into 3.0 2015-12-28 14:14:56 +01:00
DependencyInjection Merge branch '2.7' into 2.8 2015-12-30 11:33:57 +01:00
DomCrawler Merge branch '2.8' into 3.0 2015-12-28 14:14:56 +01:00
EventDispatcher Add missing exclusions from phpunit.xml.dist 2015-11-18 09:19:46 +01:00
ExpressionLanguage Merge branch '2.8' 2015-10-30 16:35:59 -07:00
Filesystem Merge branch '2.8' into 3.0 2015-12-22 11:39:06 +01:00
Finder Merge branch '2.8' into 3.0 2015-12-05 12:13:14 +01:00
Form Merge branch '2.8' into 3.0 2015-12-30 19:45:14 +01:00
HttpFoundation bug #17156 [HttpFoundation] add missing symfony/polyfill-php55 dependency (xabbuh) 2015-12-29 15:27:25 +01:00
HttpKernel Merge branch '2.8' into 3.0 2015-12-28 14:14:56 +01:00
Intl Merge branch '2.8' into 3.0 2015-12-28 14:14:56 +01:00
Ldap Merge branch '2.8' into 3.0 2015-12-18 17:56:45 +01:00
OptionsResolver Merge branch '2.8' 2015-11-18 14:48:51 +01:00
Process Merge branch '2.8' into 3.0 2015-12-30 19:45:14 +01:00
PropertyAccess Merge branch '2.8' into 3.0 2015-12-23 09:00:11 +01:00
PropertyInfo Merge branch '2.8' into 3.0 2015-12-15 03:03:07 +01:00
Routing Merge branch '2.8' into 3.0 2015-12-30 11:41:35 +01:00
Security Merge branch '2.3' into 2.7 2015-12-28 14:11:03 +01:00
Serializer Merge branch '2.8' into 3.0 2015-12-26 14:39:53 +01:00
Stopwatch Add missing exclusions from phpunit.xml.dist 2015-11-18 09:19:46 +01:00
Templating Merge branch '2.8' 2015-11-18 14:48:51 +01:00
Translation Merge branch '2.8' into 3.0 2015-12-05 18:45:07 +01:00
Validator Merge branch '2.8' into 3.0 2015-12-28 14:14:56 +01:00
VarDumper Merge branch '2.8' into 3.0 2015-12-05 12:13:14 +01:00
Yaml Merge branch '2.8' into 3.0 2015-12-28 14:14:56 +01:00