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.

Nicolas Grekas 4a177d7cb9 Merge branch '2.8' ... * 2.8: Fix tests when no Intl extension [VarDumper] Fix casting for ReflectionParameter [HttpKernel] Keep 3.0 compat by not using ContainerAware [DI] Clean a phpdoc [Security\Core] Deprecate passing $salt to BCryptPasswordEncoder::encodePassword() Conflicts: src/Symfony/Component/DependencyInjection/ContainerAware.php src/Symfony/Component/HttpKernel/Bundle/Bundle.php src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php src/Symfony/Component/VarDumper/Tests/Test/VarDumperTestTraitTest.php		2015-11-05 11:29:45 +01:00
..
Bridge	Remove deprecated ContainerAware class and make use of the trait in another class	2015-11-04 18:12:35 +01:00
Bundle	[TwigBundle] use ContainerAwareTrait in commands	2015-11-04 18:31:30 +01:00
Component	Merge branch '2.8'	2015-11-05 11:29:45 +01:00