[Routing] added setContext() method to both matchers and generators

symfony · Jan 24, 2011 · ca8c790 · ca8c790
1 parent 49793c2
commit ca8c790
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 11 deletions.
diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -41,6 +41,16 @@ public function __construct(RouteCollection $routes, array $context = array(), a
         $this->cache = array();
     }
 
+    /**
+     * Sets the request context.
+     *
+     * @param array $context  The context
+     */
+    public function setContext(array $context = array())
+    {
+        $this->context = $context;
+    }
+
     /**
      * Generates a URL from the given parameters.
      *

diff --git a/src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php b/src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php
@@ -36,6 +36,16 @@ public function __construct(array $context = array(), array $defaults = array())
         $this->defaults = $defaults;
     }
 
+    /**
+     * Sets the request context.
+     *
+     * @param array $context  The context
+     */
+    public function setContext(array $context = array())
+    {
+        $this->context = $context;
+    }
+
     /**
      * Tries to match a URL based on Apache mod_rewrite matching.
      *

diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
@@ -39,6 +39,16 @@ public function __construct(RouteCollection $routes, array $context = array(), a
         $this->defaults = $defaults;
     }
 
+    /**
+     * Sets the request context.
+     *
+     * @param array $context  The context
+     */
+    public function setContext(array $context = array())
+    {
+        $this->context = $context;
+    }
+
     /**
      * Tries to match a URL with a set of routes.
      *

diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php
@@ -94,17 +94,8 @@ public function getRouteCollection()
      */
     public function setContext(array $context = array())
     {
-        $this->context = $context;
-    }
-
-    /**
-     * Sets the defaults.
-     *
-     * @param array $defaults The defaults
-     */
-    public function setDefaults(array $defaults = array())
-    {
-        $this->defaults = $defaults;
+        $this->getMatcher()->setContext($context);
+        $this->getGenerator()->setContext($context);
     }
 
     /**