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 d5bd9bdd68 Merge branch '2.3' into 2.4 ... * 2.3: fixed types in phpdocs Conflicts: src/Symfony/Bridge/Twig/TwigEngine.php src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php src/Symfony/Component/Serializer/Encoder/XmlEncoder.php src/Symfony/Component/Stopwatch/StopwatchEvent.php src/Symfony/Component/Templating/PhpEngine.php		2014-04-16 12:34:31 +02:00
..
Dumper	Merge branch '2.3' into 2.4	2014-04-16 12:34:31 +02:00
ApacheUrlMatcher.php	[routing] added ability for apache matcher to handle array values	2013-07-30 13:22:46 +02:00
RedirectableUrlMatcher.php	Merge branch '2.3' into 2.4	2014-04-16 10:02:57 +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	Merge branch '2.3' into 2.4	2014-01-06 08:27:58 +01:00
UrlMatcher.php	Merge branch '2.3' into 2.4	2014-01-06 08:27:58 +01:00
UrlMatcherInterface.php	fixed CS	2012-07-09 14:54:20 +02:00