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/HttpKernel/DependencyInjection
Fabien Potencier 64535bbcb2 Merge branch '2.2' into 2.3
* 2.2:
  [HttpKernel] added a missing dep for dev
  [Form] fixed wrong call to setTimeZone() (closes #8644)
  Fix issue with \DateTimeZone::UTC / 'UTC' for PHP 5.4
  [Form] Removed the "disabled" attribute from the placeholder option in select fields due to problems with the BlackBerry 10 browser
  [routing] added ability for apache matcher to handle array values
  removed dead code and fixed CS
  [Validator] fixed StaticMethodLoader trying to invoke methods of abstract classes (closes #8589)

Conflicts:
	src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php
	src/Symfony/Component/Form/FormConfigBuilder.php
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Validator/Tests/GraphWalkerTest.php
2013-08-02 22:53:38 +02:00
..
AddClassesToCachePass.php updated license blocks 2012-03-31 18:00:32 -03:00
ConfigurableExtension.php Passed the config when building the Configuration in ConfigurableExtension 2013-06-26 14:56:23 +02:00
ContainerAwareHttpKernel.php Merge branch '2.2' into 2.3 2013-08-02 22:53:38 +02:00
Extension.php [DI] Add a base class for extension 2012-12-06 15:41:32 +01:00
MergeExtensionConfigurationPass.php updated license blocks 2012-03-31 18:00:32 -03:00
RegisterListenersPass.php moved the kernel listener compiler pass to HttpKernel to make it reusable (refs #6643) 2013-04-25 16:01:08 +02:00