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 Framework Bundle -- clone into Symfony/Bundle (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 eca9843c59
Fabien Potencier fabpot authored
Octocat-spinner-32 CacheWarmer Merge branch '2.4' April 16, 2014
Octocat-spinner-32 Command made types consistent with those defined in Hack April 16, 2014
Octocat-spinner-32 Console Merge branch '2.4' April 16, 2014
Octocat-spinner-32 Controller Merge branch '2.4' April 16, 2014
Octocat-spinner-32 DataCollector moved the request data collector to HttpKernel July 18, 2012
Octocat-spinner-32 DependencyInjection Merge branch '2.4' April 16, 2014
Octocat-spinner-32 EventListener fixed visibility November 04, 2013
Octocat-spinner-32 Fragment [HttpKernel] added escaping for hx:include tag attributes March 29, 2013
Octocat-spinner-32 HttpCache made phpdoc types consistent with those defined in Hack April 15, 2014
Octocat-spinner-32 Resources Merge branch '2.4' April 10, 2014
Octocat-spinner-32 Routing minor #9487 unify constructor initialization style throughout symfony… November 22, 2013
Octocat-spinner-32 Templating Merge branch '2.4' April 16, 2014
Octocat-spinner-32 Test fixed previous merge March 03, 2014
Octocat-spinner-32 Tests [FrameworkBundle] Only initialize a fully configured service if APC i… April 03, 2014
Octocat-spinner-32 Translation Merge branch '2.4' April 16, 2014
Octocat-spinner-32 Validator [validator] throw an exception if isn't an instance of ConstraintVali… December 07, 2013
Octocat-spinner-32 .gitignore Added missing files .gitignore July 21, 2013
Octocat-spinner-32 CHANGELOG.md Added a translation:debug command March 03, 2014
Octocat-spinner-32 Client.php made {@inheritdoc} annotations consistent across the board April 16, 2014
Octocat-spinner-32 FrameworkBundle.php [EventDispatcher][HttpKernel] Move RegisterListenersPass from HttpKer… December 18, 2013
Octocat-spinner-32 composer.json [FrameworkBundle] Update composer.json to account for #9792 January 05, 2014
Octocat-spinner-32 phpunit.xml.dist [FrameworkBundle] Added missing files for phpunit May 20, 2013
Something went wrong with that request. Please try again.