Merge remote branch 'danielholmes/request_context_routing'

fabpot · fabpot · commit 158181d34b42 · 2011-04-30T07:26:04.000+02:00
* danielholmes/request_context_routing:
  [Routing] added setContext to RouterInterfaces as it is used on RouterInterface references
diff --git a/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php b/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php
@@ -11,12 +11,14 @@
 
 namespace Symfony\Component\Routing\Generator;
 
+use Symfony\Component\Routing\RequestContextAwareInterface;
+
 /**
  * UrlGeneratorInterface is the interface that all URL generator classes must implements.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-interface UrlGeneratorInterface
+interface UrlGeneratorInterface extends RequestContextAwareInterface
 {
     /**
      * Generates a URL from the given parameters.
diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcherInterface.php b/src/Symfony/Component/Routing/Matcher/UrlMatcherInterface.php
@@ -11,12 +11,14 @@
 
 namespace Symfony\Component\Routing\Matcher;
 
+use Symfony\Component\Routing\RequestContextAwareInterface;
+
 /**
  * UrlMatcherInterface is the interface that all URL matcher classes must implement.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-interface UrlMatcherInterface
+interface UrlMatcherInterface extends RequestContextAwareInterface
 {
     /**
      * Tries to match a URL with a set of routes.
diff --git a/src/Symfony/Component/Routing/RequestContextAwareInterface.php b/src/Symfony/Component/Routing/RequestContextAwareInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Routing;
+
+interface RequestContextAwareInterface
+{
+    /**
+     * Sets the request context.
+     *
+     * @param RequestContext $context The context
+     */
+    function setContext(RequestContext $context);
+}

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,14 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Routing\Generator;`
`13`	`13`
	`14`	`+use Symfony\Component\Routing\RequestContextAwareInterface;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* UrlGeneratorInterface is the interface that all URL generator classes must implements.`
`16`	`18`	`*`
`17`	`19`	`* @author Fabien Potencier <fabien@symfony.com>`
`18`	`20`	`*/`
`19`		`-interface UrlGeneratorInterface`
	`21`	`+interface UrlGeneratorInterface extends RequestContextAwareInterface`
`20`	`22`	`{`
`21`	`23`	`/**`
`22`	`24`	`* Generates a URL from the given parameters.`