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/Templating
Fabien Potencier 7c026bb33e Merge branch '2.6' into 2.7
* 2.6:
  [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
2014-12-22 17:45:18 +01:00
..
Asset Fix some annotates 2013-09-19 11:36:05 +02:00
Helper Merge branch '2.6' into 2.7 2014-12-22 17:45:18 +01:00
Loader Docblock fixes 2014-11-30 13:33:44 +00:00
Debugger.php [Templating] deprecate DebuggerInterface 2013-09-04 21:57:45 +02:00
DelegatingEngine.php Merge branch '2.3' into 2.4 2014-01-01 09:14:50 +01:00
EngineInterface.php [Templating] fix logic regarding template references and many phpdocs 2013-10-01 14:37:05 +02:00
GlobalVariables.php Merge branch '2.5' into 2.6 2014-12-02 21:19:20 +01:00
PhpEngine.php [Templating] fix logic regarding template references and many phpdocs 2013-10-01 14:37:05 +02:00
TemplateFilenameParser.php fixed missing use statements 2013-12-31 11:50:12 +01:00
TemplateNameParser.php Merge branch '2.3' into 2.5 2014-12-11 20:53:06 +01:00
TemplateReference.php [2.3] CS And DocBlock Fixes 2014-12-22 16:58:09 +01:00
TimedPhpEngine.php Docblock fixes 2014-11-30 13:33:44 +00:00