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/DependencyInjection/Tests/Fixtures
Fabien Potencier 33abe5c6d6 Merge branch '2.3' into 2.6
* 2.3:
  CS: fixes
  Translator component has default domain for null implemented no need to have default translation domain logic in 3 different places
  [travis] Kill tests when a new commit has been pushed
  fixed CS
  Change behavior to mirror hash_equals() returning early if there is a length mismatch
  CS fixing
  Prevent modifying secrets as much as possible
  Update StringUtils.php
  Whitespace
  Update StringUtils.php
  CS: general fixes
  [SecurityBundle] removed a duplicated service definition and simplified others.

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
	src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
	src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
2015-03-27 11:19:51 +01:00
..
containers Marked the ResolveParameterPlaceHoldersPassTest as legacy 2015-03-17 13:42:58 +01:00
graphviz [DependencyInjection] Tweaked factories 2014-10-02 01:48:53 +04:00
includes Merge branch '2.3' into 2.5 2014-12-02 21:15:53 +01:00
ini moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00
php Merge branch '2.3' into 2.6 2015-03-27 11:19:51 +01:00
xml Merge branch '2.5' into 2.6 2015-01-13 08:22:24 +01:00
yaml Merge branch '2.5' into 2.6 2015-01-13 08:22:24 +01:00