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/Bundle/FrameworkBundle/Tests/Templating
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
..
Helper Merge branch '2.5' into 2.6 2014-12-22 17:44:09 +01:00
Loader [FrameworkBundle] Improve the TemplateLocator exception message 2011-12-09 10:35:15 +01:00
DelegatingEngineTest.php Merge branch '2.3' into 2.4 2014-09-22 10:51:05 +02:00
GlobalVariablesTest.php Fixed a bug and added unit-tests for GlobalVariables 2014-09-24 16:46:33 +02:00
PhpEngineTest.php Remove aligned '=>' and '=' 2014-10-30 21:17:55 +01:00
TemplateFilenameParserTest.php [FrameworkBundle] Create a dedicated template filename parser 2012-07-03 14:58:30 +02:00
TemplateNameParserTest.php [FrameworkBundle][Template name] avoid error message for the shortcut notation. 2014-12-08 10:32:45 +00:00
TemplateReferenceTest.php fixed CS 2011-06-23 13:39:36 +02:00
TemplateTest.php [FrameworkBundle] removed unneeded files in tests 2011-04-21 22:43:38 +02:00
TimedPhpEngineTest.php fixed CS 2013-10-30 09:30:20 +01:00