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
Nicolas Grekas 8cf0613ead Merge branch '2.6' into 2.7
* 2.6:
  [Routing][DependencyInjection] Support .yaml extension in YAML loaders
  [DX] improve file loader error for router/other resources in bundle
  [FrameworkBundle] Initialize translator with the default locale.
  [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
  [2.6][Translation] remove duplicate code for loading catalogue.
  [HttpKernel] Cleanup ExceptionListener
  CS fixes
  [DependencyInjection] Show better error when the Yaml component is not installed
  [2.3] SCA for Components - reference mismatches
  [Debug] Scream as LogLevel::DEBUG (but for fatal errors / uncaught exceptions)
  [2.3] Static Code Analysis for Components
  [WebProfilerBundle] Fix resiliency to exceptions thrown by the url generator
  [Translation] LoggingTranslator simplifications
  [Translation][fixed test] refresh cache when resources are no longer fresh.
  [FrameworkBundle] Fixed server:start --router relative path issue #14124
  [FrameworkBundle] improve usage of Table helper
  [Validator] Added missing Simplified Chinese (zh_CN) translations
  [FrameworkBundle] Workaround php -S ignoring auto_prepend_file

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
	src/Symfony/Component/Console/Helper/Table.php
	src/Symfony/Component/Translation/LoggingTranslator.php
2015-04-18 17:11:06 +02:00
..
Asset [Asset] added the component 2015-02-10 13:45:00 +01:00
Helper Merge branch '2.6' into 2.7 2015-04-18 17:11:06 +02:00
Loader CS: Convert double quotes to single quotes 2015-03-21 12:11:30 +01:00
Debugger.php Normalized @deprecated annotations. 2015-01-05 16:02:26 +01: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 decoupled global variables system in Twig from the Templating one 2015-01-10 16:20:07 +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