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
Fabien Potencier 72c169e8a1 Merge branch '2.5' into 2.6
* 2.5:
  [2.3] CS And DocBlock Fixes
  [2.3] CS Fixes
  [FrameworkBundle] Fixed Translation loader and update translation command.
  [Console] remove « use » statement for PHP built-in exception classes.
  [SecurityBundle] adds unit tests suite for SecurityDataCollector class.

Conflicts:
	src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
	src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
	src/Symfony/Component/Form/Form.php
	src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
	src/Symfony/Component/OptionsResolver/Options.php
	src/Symfony/Component/OptionsResolver/OptionsResolver.php
	src/Symfony/Component/Process/ProcessPipes.php
	src/Symfony/Component/Stopwatch/Stopwatch.php
	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
	src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
2014-12-22 17:44:09 +01:00
..
Compiler Merge branch '2.5' into 2.6 2014-12-22 17:44:09 +01:00
Dumper Merge branch '2.5' into 2.6 2014-12-12 17:21:40 +01:00
Extension fixed CS 2014-09-22 10:32:35 +02:00
Fixtures Merge branch '2.5' into 2.6 2014-12-12 17:21:40 +01:00
LazyProxy [2.3] CS And DocBlock Fixes 2014-12-22 16:58:09 +01:00
Loader Merge branch '2.5' into 2.6 2014-12-05 13:00:15 +01:00
ParameterBag [DependencyInjection] fixed ? position in some exception messages (refs #7861) 2013-05-01 06:24:56 +02:00
ContainerBuilderTest.php Merge branch '2.5' 2014-10-26 08:46:28 +01:00
ContainerTest.php Merge branch '2.5' into 2.6 2014-11-28 11:00:40 +01:00
CrossCheckTest.php removed deps checks in unit tests 2013-08-19 22:44:22 +02:00
DefinitionDecoratorTest.php added a new Syntax to define factories as callables. 2014-09-24 08:27:41 +02:00
DefinitionTest.php [DependencyInjection] Tweaked factories 2014-10-02 01:48:53 +04:00
ParameterTest.php moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00
ReferenceTest.php moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00