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 6a0b617c3d Merge branch '2.7'
* 2.7: (60 commits)
  [Translation][Profiler] fixed Collect empty Messages.
  [VarDumper] Towards PHP7 support
  Fix currently broken tests
  [Form][choice] added choice_translation_domain to avoid trans options.
  [Translation][Profiler]  added the number of times a translation has been used.
  [DoctrineBridge] Removed useless code
  [Debug] Updated CHANGELOG
  [Debug] Use symfony_debug_backtrace() in FatalErrorException when available
  [Debug] Add debug extension to the test suite
  [Debug] Add symfony_debug_backtrace() that works with fatal errors
  [Form] Updated CHANGELOG and UPGRADE files
  [HttpKernel] Embed the original exception as previous to bounced exceptions
  Added feedback about the current symfony version
  Deprecated precision option in favor of scale
  [Enhancement] netbeans - force interactive shell when limited detection
  Automatically start server:run if server:start failed
  Tweaked some console command styles
  [FrameworkBundle] fixes displaying of deprecation notices.
  make date formats and number formats configurable
  Revert "Added missing changelog entry"
  ...

Conflicts:
	CHANGELOG-2.3.md
	CHANGELOG-2.6.md
	src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/TwigBundle/Extension/ActionsExtension.php
	src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php
	src/Symfony/Component/Debug/CHANGELOG.md
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/Form/CHANGELOG.md
	src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
	src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
2015-04-05 10:20:29 +02:00
..
Helper Merge branch '2.7' 2015-04-05 10:20:29 +02:00
Loader CS: Convert double quotes to single quotes 2015-03-21 12:11:30 +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