From f5079ffb1b74531e2de7635cab32e6498e17aa65 Mon Sep 17 00:00:00 2001 From: Larry Garfield Date: Sun, 20 May 2012 19:29:26 -0500 Subject: [PATCH] Rename UrlMatcher to LegacyUrlMatcher. The current matcher is a temporary legacy shiv to support the old routing system. Label it as such so that we can reserve the class name for the new and imroved router. --- core/lib/Drupal/Core/DrupalKernel.php | 2 +- core/lib/Drupal/Core/{UrlMatcher.php => LegacyUrlMatcher.php} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename core/lib/Drupal/Core/{UrlMatcher.php => LegacyUrlMatcher.php} (97%) diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php index 6a6fb35ec1e..b7dfd3a9316 100644 --- a/core/lib/Drupal/Core/DrupalKernel.php +++ b/core/lib/Drupal/Core/DrupalKernel.php @@ -45,7 +45,7 @@ class DrupalKernel extends HttpKernel { public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver) { parent::__construct($dispatcher, $resolver); - $this->matcher = new UrlMatcher(); + $this->matcher = new LegacyUrlMatcher(); $this->dispatcher->addSubscriber(new RouterListener($this->matcher)); $negotiation = new ContentNegotiation(); diff --git a/core/lib/Drupal/Core/UrlMatcher.php b/core/lib/Drupal/Core/LegacyUrlMatcher.php similarity index 97% rename from core/lib/Drupal/Core/UrlMatcher.php rename to core/lib/Drupal/Core/LegacyUrlMatcher.php index 57b6317f10a..1ea0c5dcc13 100644 --- a/core/lib/Drupal/Core/UrlMatcher.php +++ b/core/lib/Drupal/Core/LegacyUrlMatcher.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\Core\UrlMatcher. + * Definition of Drupal\Core\LegacyUrlMatcher. */ namespace Drupal\Core; @@ -19,7 +19,7 @@ use Symfony\Component\Routing\RouteCollection; /** * UrlMatcher matches URL based on a set of routes. */ -class UrlMatcher implements UrlMatcherInterface { +class LegacyUrlMatcher implements UrlMatcherInterface { /** * The request context for this matcher.