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/TwigBundle
Nicolas Grekas 0b39ce2315 Merge branch '2.6' into 2.7
* 2.6: (24 commits)
  [HttpKernel] Embed the original exception as previous to bounced exceptions
  [Enhancement] netbeans - force interactive shell when limited detection
  [FrameworkBundle] fixes displaying of deprecation notices.
  Revert "Added missing changelog entry"
  [Debug] Tweak docblocks
  [Debug] Rework a bit the PHP doc
  Added missing changelog entry
  [StringUtil] Fixed singularification of 'movies'
  [Debug] Renamed "context" key to "scope_vars" to avoid any ambiguity
  Fix some phpdocs for Twig extensions & templating helpers
  [Debug] Made code in ErrorHandler easier to read
  Use specialized config methods instead of the generic ifTrue() method
  Fix the AJAX profiling
  bumped Symfony version to 2.6.7
  updated VERSION for 2.6.6
  updated CHANGELOG for 2.6.6
  Safe escaping of fragments for eval()
  bumped Symfony version to 2.3.28
  updated VERSION for 2.3.27
  update CONTRIBUTORS for 2.3.27
  ...

Conflicts:
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/HttpKernel/Kernel.php
2015-04-03 17:24:01 +02:00
..
CacheWarmer Docblock fixes 2014-11-30 13:33:44 +00:00
Command [FrameworkBundle] Move lint commands to lint namespace. 2015-04-02 15:30:12 +01:00
Controller Merge branch '2.3' into 2.6 2015-03-12 15:30:42 +01:00
Debug integrated the Twig profiler 2015-01-25 19:10:07 +01:00
DependencyInjection Merge branch '2.6' into 2.7 2015-04-03 17:24:01 +02:00
Extension Merge branch '2.6' into 2.7 2015-04-03 17:24:01 +02:00
Loader Merge branch '2.3' into 2.5 2014-11-28 11:00:29 +01:00
Node [TwigBundle] added missing @deprecated tags 2015-01-03 14:39:19 +01:00
Resources make date formats and number formats configurable 2015-04-03 10:30:44 +02:00
Tests [2.7] add @group legacy 2015-03-13 18:50:01 +01:00
TokenParser [TwigBundle] added missing @deprecated tags 2015-01-03 14:39:19 +01:00
.gitignore Added missing files .gitignore 2013-07-21 14:12:18 +02:00
CHANGELOG.md make date formats and number formats configurable 2015-04-03 10:30:44 +02:00
composer.json Merge branch '2.3' into 2.6 2015-02-24 12:52:21 +01:00
phpunit.xml.dist [2.3] require-dev PHPUnit bridge 2015-02-24 11:24:26 +01:00
TwigBundle.php [TwigBundle] Adds service check for extension loading 2013-03-14 12:28:51 +01:00
TwigDefaultEscapingStrategy.php [TwigBundle] use the new Twig autoescaping strategy 2015-01-14 06:59:05 +01:00
TwigEngine.php [TwigBundle] use the new Twig autoescaping strategy 2015-01-14 06:59:05 +01:00