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.

Fabien Potencier 2314328b16 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		2014-04-16 12:36:21 +02:00
..
Command	Fixed doc of InitAclCommand	2014-03-19 21:51:09 +01:00
DataCollector	fixed types in phpdocs	2014-04-16 12:30:19 +02:00
DependencyInjection	Merge branch '2.4'	2014-04-16 12:36:21 +02:00
EventListener	security acl dbal schema: inject the schema instead of the whole container	2013-07-18 14:31:55 +02:00
Resources	Merge branch '2.3' into 2.4	2014-01-07 14:28:54 +01:00
Security	updated license blocks	2012-03-31 18:00:32 -03:00
Templating/Helper	Merge branch '2.4'	2014-04-16 10:08:40 +02:00
Tests	Make it possible to match the request based on HTTP methods in the firewall configuration	2014-03-14 12:27:42 +01:00
Twig/Extension	replaced deprecated Twig features	2013-08-06 10:52:18 +02:00
.gitignore	Added missing files .gitignore	2013-07-21 14:12:18 +02:00
CHANGELOG.md	[SecurityBundle] Added csrf_token_generator and csrf_token_id as new	2013-11-23 10:55:30 +00:00
composer.json	updated version to 2.5	2013-11-24 21:17:07 +01:00
phpunit.xml.dist	[SecurityBundle] Added missing files for phpunit	2013-05-20 11:51:16 +02:00
SecurityBundle.php	moved the simple HTTP authenticator to a pre-auth one	2013-05-08 15:02:48 +02:00