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.
symfony/src/Symfony/Component/Routing/Matcher
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
..
Dumper Merge branch '2.4' 2014-04-16 12:36:21 +02:00
ApacheUrlMatcher.php [Routing][FrameworkBundle] Deprecated the apache dumper 2014-01-13 21:29:22 +01:00
RedirectableUrlMatcher.php Merge branch '2.4' 2014-04-16 10:08:40 +02:00
RedirectableUrlMatcherInterface.php [Routing] added more phpdoc and replaced 'array of type' by 'Type[]' 2012-11-12 16:14:50 +01:00
RequestMatcherInterface.php fixed CS 2012-07-09 14:54:20 +02:00
TraceableUrlMatcher.php Remove usage of deprecated _scheme in Routing Component 2014-01-06 08:32:07 +01:00
UrlMatcher.php Remove usage of deprecated _scheme in Routing Component 2014-01-06 08:32:07 +01:00
UrlMatcherInterface.php fixed CS 2012-07-09 14:54:20 +02:00