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
..
Util	made types consistent with those defined in Hack	2014-04-16 10:09:01 +02:00
ConfigDataCollector.php	fixed types in phpdocs	2014-04-16 12:30:19 +02:00
DataCollector.php	[HttpKernel] Added the resource ID when printing a resource in the DataCollector	2014-04-10 19:43:37 +02:00
DataCollectorInterface.php	fixed CS	2012-07-09 14:54:20 +02:00
EventDataCollector.php	removed unneeded use statements	2014-01-01 10:02:49 +01:00
ExceptionDataCollector.php	fixed types in phpdocs	2014-04-16 12:30:19 +02:00
LateDataCollectorInterface.php	Removed dead code (unused use statements).	2013-10-16 13:59:56 +02:00
LoggerDataCollector.php	[WebProfilerBundle] enhance logs display	2014-03-18 10:04:14 +01:00
MemoryDataCollector.php	Merge branch '2.3' into 2.4	2014-04-16 12:34:31 +02:00
RequestDataCollector.php	Merge branch '2.4'	2014-04-16 10:08:40 +02:00
RouterDataCollector.php	fixed types in phpdocs	2014-04-16 12:30:19 +02:00
TimeDataCollector.php	Merge branch '2.3' into 2.4	2014-04-16 12:34:31 +02:00