From dbcab141c39a5ee1131b98f30273dfa5be09cfda Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Wed, 8 Jan 2014 22:03:56 +0000 Subject: [PATCH 1/2] [Routing][FrameworkBundle] Deprecated the ApacheMatcherDumper, ApacheUrlMatcher and RouterApacheDumperCommand. --- src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md | 3 ++- .../FrameworkBundle/Command/RouterApacheDumperCommand.php | 4 ++++ src/Symfony/Component/Routing/CHANGELOG.md | 7 +++++++ src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php | 4 ++++ .../Routing/Matcher/Dumper/ApacheMatcherDumper.php | 4 ++++ 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md index 1ee3e860dbce8..3845ac5f7c0f0 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md +++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md @@ -4,7 +4,8 @@ CHANGELOG 2.5.0 ----- -* Added `yaml:lint` command + * Added `yaml:lint` command + * Deprecated the `RouterApacheDumperCommand` which will be removed in Symfony 3.0. 2.4.0 ----- diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php index c8a17e8904b05..c122576fd5614 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php @@ -21,6 +21,10 @@ /** * RouterApacheDumperCommand. * + * @deprecated Deprecated since version 2.5, to be removed in 3.0. + * The performance gains are minimal and it's very hard to replicate + * the behavior of PHP implementation. + * * @author Fabien Potencier */ class RouterApacheDumperCommand extends ContainerAwareCommand diff --git a/src/Symfony/Component/Routing/CHANGELOG.md b/src/Symfony/Component/Routing/CHANGELOG.md index f0c616d080b5e..8b604ead11510 100644 --- a/src/Symfony/Component/Routing/CHANGELOG.md +++ b/src/Symfony/Component/Routing/CHANGELOG.md @@ -1,6 +1,13 @@ CHANGELOG ========= +2.5.0 +----- + + * [DEPRECATION] The `ApacheMatcherDumper` and `ApacheUrlMatcher` were deprecated and + will be removed in Symfony 3.0, since the performance gains were minimal and + it's hard to replicate the behaviour of PHP implementation. + 2.3.0 ----- diff --git a/src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php b/src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php index 55aac6b7079dc..35b1dc50ed2d7 100644 --- a/src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php +++ b/src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php @@ -16,6 +16,10 @@ /** * ApacheUrlMatcher matches URL based on Apache mod_rewrite matching (see ApacheMatcherDumper). * + * @deprecated Deprecated since version 2.5, to be removed in 3.0. + * The performance gains are minimal and it's very hard to replicate + * the behavior of PHP implementation. + * * @author Fabien Potencier * @author Arnaud Le Blanc */ diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php index 5b32684876b96..fc76c192778c5 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php @@ -16,6 +16,10 @@ /** * Dumps a set of Apache mod_rewrite rules. * + * @deprecated Deprecated since version 2.5, to be removed in 3.0. + * The performance gains are minimal and it's very hard to replicate + * the behavior of PHP implementation. + * * @author Fabien Potencier * @author Kris Wallsmith */ From d524eec3233bcd5109bc7277e3ffd4c3c2e20e6c Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Mon, 13 Jan 2014 08:06:24 +0100 Subject: [PATCH 2/2] Documented removal of the apache matcher dumper in 3.0. --- UPGRADE-3.0.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md index aab13e955e479..2b2fd16c94eb7 100644 --- a/UPGRADE-3.0.md +++ b/UPGRADE-3.0.md @@ -271,6 +271,8 @@ UPGRADE FROM 2.x to 3.0 end($form) ?> ``` + * The `RouterApacheDumperCommand` was removed. + ### HttpKernel * The `Symfony\Component\HttpKernel\Log\LoggerInterface` has been removed in @@ -381,6 +383,10 @@ UPGRADE FROM 2.x to 3.0 $route->setSchemes('https'); ``` + * The `ApacheMatcherDumper` and `ApacheUrlMatcher` were removed since + the performance gains were minimal and it's hard to replicate the behaviour + of PHP implementation. + ### Security * The `Resources/` directory was moved to `Core/Resources/`