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
Fabien Potencier d38a4b3414 Merge branch '2.5'
* 2.5:
  fixed previous merge
  Added missing `break` statement
  don't disable constructor calls to mockups of classes that extend internal PHP classes
  Small comment update according to PSR-2
  [Yaml] fix overwriting of keys after merged map
  [Yaml] fix priority of sequence merges according to spec
  [Console] Fixed notice in QuestionHelper
  [Console] Fixed notice in DialogHelper
  [Yaml] refactoring of merges for performance
  [Console] remove weird use statement
  [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6
  [Filesystem] Fix test suite on OSX
  [FrameworkBundle] Redirect server output to /dev/null in case no verbosity is needed
  Add framework-bundle

Conflicts:
	src/Symfony/Component/Yaml/Parser.php
2014-06-20 19:41:51 +02:00
..
CacheWarmer fixed types in phpdocs 2014-04-16 12:30:19 +02:00
Command Add command to list twig functions, filters, globals and tests 2014-03-27 08:58:32 +01:00
Controller [HttpFoundation] factorize out the way output buffers should be closed 2014-04-17 16:18:17 +00:00
Debug [TwigBundle] removed undefined argument 2014-04-12 18:24:05 +02:00
DependencyInjection Revert "bug #9112 Prepend Child Bundle paths before the parent (trsteel88)" 2014-01-02 12:38:40 +01:00
Extension made types consistent with those defined in Hack 2014-04-16 10:09:01 +02:00
Loader [Templating] fix logic regarding template references and many phpdocs 2013-10-01 14:37:05 +02:00
Node restricted to only URIs the first argument of the render tag 2012-12-20 08:31:14 +01:00
Resources error.html.twig should contain a email value 2014-06-03 22:41:34 +02:00
Tests Fixed typo 2014-04-09 09:13:16 +01:00
TokenParser removed dead code and fixed CS 2013-07-28 20:26:16 +02:00
.gitignore Added missing files .gitignore 2013-07-21 14:12:18 +02:00
CHANGELOG.md [TwigBundle] removed @ when defining an autoescaping service, and fixed XSD to use - instead of _ 2013-04-21 10:18:50 +02:00
composer.json Merge branch '2.5' 2014-06-20 19:41:51 +02:00
phpunit.xml.dist [TwigBundle] Added missing files for phpunit 2013-05-16 11:58:37 +02:00
TwigBundle.php [TwigBundle] Adds service check for extension loading 2013-03-14 12:28:51 +01:00
TwigEngine.php Merge branch '2.3' into 2.4 2013-12-12 17:09:11 +01:00