Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

[READ-ONLY] Subtree split of the Symfony Twig Bridge -- clone into Symfony/Bridge/Twig (master at symfony/symfony)

Merge branch '2.4'

* 2.4:
  unified return null usages
  [Validator] added Japanese translation
  Textarea value should default to empty string instead of null.
  Fix doc blocks
  [Process] Fix #10681, process are failing on Windows Server 2003
  updated doc
  [Security] fix DBAL connection typehint
  [HttpFoundation] status 201 is allowed to have a body
  unified return null usages

Conflicts:
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/DomCrawler/Crawler.php
	src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
latest commit 28c7cbd161
Fabien Potencier fabpot authored April 18, 2014
Octocat-spinner-32 Command made {@inheritdoc} annotations consistent across the board April 16, 2014
Octocat-spinner-32 Extension Merge branch '2.3' into 2.4 April 16, 2014
Octocat-spinner-32 Form Merge branch '2.3' into 2.4 April 16, 2014
Octocat-spinner-32 Node Merge branch '2.3' into 2.4 January 26, 2014
Octocat-spinner-32 NodeVisitor Merge branch '2.3' into 2.4 April 18, 2014
Octocat-spinner-32 Resources Merge branch '2.4' March 26, 2014
Octocat-spinner-32 Tests Merge branch '2.4' January 26, 2014
Octocat-spinner-32 TokenParser Merge branch '2.3' into 2.4 January 26, 2014
Octocat-spinner-32 Translation Merge branch '2.3' into 2.4 April 16, 2014
Octocat-spinner-32 .gitignore Added missing files .gitignore July 21, 2013
Octocat-spinner-32 CHANGELOG.md [Twig] Decouple Twig commands from the Famework December 31, 2013
Octocat-spinner-32 LICENSE update year on licenses January 07, 2014
Octocat-spinner-32 README.md updated the composer install command to reflect changes in Composer September 18, 2013
Octocat-spinner-32 TwigEngine.php [Templating] fix logic regarding template references and many phpdocs October 01, 2013
Octocat-spinner-32 composer.json Merge branch '2.4' March 26, 2014
Octocat-spinner-32 phpunit.xml.dist made usage of Composer autoloader for subtree-split unit tests November 09, 2012
README.md

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
Something went wrong with that request. Please try again.