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/Bridge/Twig
Fabien Potencier 2827747108 Merge branch '2.3' into 2.4
* 2.3:
  Textarea value should default to empty string instead of null.
  Fix doc blocks
  [Process] Fix #10681, process are failing on Windows Server 2003
  [Security] fix DBAL connection typehint
  [HttpFoundation] status 201 is allowed to have a body
  unified return null usages

Conflicts:
	src/Symfony/Component/Console/Helper/DescriptorHelper.php
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
	src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
	src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
2014-04-18 22:37:09 +02:00
..
Extension Merge branch '2.3' into 2.4 2014-04-16 12:34:31 +02:00
Form Merge branch '2.3' into 2.4 2014-04-16 12:34:31 +02:00
Node Merge branch '2.3' into 2.4 2014-01-26 22:33:04 +01:00
NodeVisitor Merge branch '2.3' into 2.4 2014-04-18 22:37:09 +02:00
Resources/views/Form Merge branch '2.3' into 2.4 2014-03-26 12:35:33 +01:00
Tests Merge branch '2.3' into 2.4 2014-01-26 22:33:04 +01:00
TokenParser Merge branch '2.3' into 2.4 2014-01-26 22:33:04 +01:00
Translation Merge branch '2.3' into 2.4 2014-04-16 10:02:57 +02:00
.gitignore Added missing files .gitignore 2013-07-21 14:12:18 +02:00
CHANGELOG.md Created stopwatch tag 2013-08-11 20:05:14 +02:00
composer.json fixed typo 2014-03-14 11:12:00 +01:00
LICENSE update year on licenses 2014-01-07 08:19:25 -05:00
phpunit.xml.dist made usage of Composer autoloader for subtree-split unit tests 2012-11-09 14:10:06 +01:00
README.md updated the composer install command to reflect changes in Composer 2013-09-18 09:27:26 +02:00
TwigEngine.php fixed types in phpdocs 2014-04-16 12:30:19 +02:00

Twig Bridge

Provides integration for Twig with various Symfony2 components.

Resources

If you want to run the unit tests, install dev dependencies before running PHPUnit:

$ cd path/to/Symfony/Bridge/Twig/
$ composer.phar install
$ phpunit