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 Security 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 20f1b8f746
Fabien Potencier fabpot authored
Octocat-spinner-32 Command Fixed doc of InitAclCommand March 19, 2014
Octocat-spinner-32 DataCollector fixed types in phpdocs April 16, 2014
Octocat-spinner-32 DependencyInjection Merge branch '2.4' April 16, 2014
Octocat-spinner-32 EventListener security acl dbal schema: inject the schema instead of the whole cont… July 18, 2013
Octocat-spinner-32 Resources Merge branch '2.3' into 2.4 January 07, 2014
Octocat-spinner-32 Security updated license blocks March 31, 2012
Octocat-spinner-32 Templating Merge branch '2.4' April 16, 2014
Octocat-spinner-32 Tests Make it possible to match the request based on HTTP methods in the fi… March 14, 2014
Octocat-spinner-32 Twig replaced deprecated Twig features August 06, 2013
Octocat-spinner-32 .gitignore Added missing files .gitignore July 21, 2013
Octocat-spinner-32 CHANGELOG.md [SecurityBundle] Added csrf_token_generator and csrf_token_id as new … November 23, 2013
Octocat-spinner-32 SecurityBundle.php moved the simple HTTP authenticator to a pre-auth one May 08, 2013
Octocat-spinner-32 composer.json updated version to 2.5 November 24, 2013
Octocat-spinner-32 phpunit.xml.dist [SecurityBundle] Added missing files for phpunit May 20, 2013
Something went wrong with that request. Please try again.