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 Bundle -- clone into Symfony/Bundle/TwigBundle (master at symfony/symfony)

Merge branch '2.4'

* 2.4:
  fixed types in phpdocs
  fixed types in phpdocs

Conflicts:
	src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
	src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
	src/Symfony/Component/Validator/Mapping/ElementMetadata.php
	src/Symfony/Component/Validator/Mapping/MemberMetadata.php
	src/Symfony/Component/Validator/MetadataFactoryInterface.php
latest commit 70ff13e934
Fabien Potencier fabpot authored April 16, 2014
Octocat-spinner-32 CacheWarmer fixed types in phpdocs April 16, 2014
Octocat-spinner-32 Command Add command to list twig functions, filters, globals and tests March 27, 2014
Octocat-spinner-32 Controller made phpdoc types consistent with those defined in Hack April 15, 2014
Octocat-spinner-32 Debug [TwigBundle] removed undefined argument April 12, 2014
Octocat-spinner-32 DependencyInjection Revert "bug #9112 Prepend Child Bundle paths before the parent (trste… January 02, 2014
Octocat-spinner-32 Extension made types consistent with those defined in Hack April 16, 2014
Octocat-spinner-32 Loader [Templating] fix logic regarding template references and many phpdocs October 01, 2013
Octocat-spinner-32 Node restricted to only URIs the first argument of the render tag December 20, 2012
Octocat-spinner-32 Resources Merge branch '2.4' April 16, 2014
Octocat-spinner-32 Tests Fixed typo April 09, 2014
Octocat-spinner-32 TokenParser [TwigBundle] removed deprecated syntax March 23, 2013
Octocat-spinner-32 .gitignore Added missing files .gitignore July 21, 2013
Octocat-spinner-32 CHANGELOG.md [TwigBundle] removed @ when defining an autoescaping service, and fix… April 21, 2013
Octocat-spinner-32 TwigBundle.php [TwigBundle] Adds service check for extension loading March 14, 2013
Octocat-spinner-32 TwigEngine.php Merge branch '2.3' into 2.4 December 12, 2013
Octocat-spinner-32 composer.json [TwigBundle] Add possibility to generate absolute assets urls March 14, 2014
Octocat-spinner-32 phpunit.xml.dist [TwigBundle] Added missing files for phpunit May 16, 2013
Something went wrong with that request. Please try again.