symfony · sebhoerl · Dec 30, 2011 · Dec 30, 2011 · Dec 30, 2011
diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -146,10 +146,15 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
 
         if ($this->context->getHost()) {
             $scheme = $this->context->getScheme();
+            $host = $this->context->getHost();
             if (isset($requirements['_scheme']) && ($req = strtolower($requirements['_scheme'])) && $scheme != $req) {
                 $absolute = true;
                 $scheme = $req;
             }
+            if (isset($requirements['_host']) && ($req = $requirements['_host']) && $host != $req) {
+                $absolute = true;
+                $host = $req;
+            }
 
             if ($absolute) {
                 $port = '';
@@ -159,7 +164,7 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
                     $port = ':'.$this->context->getHttpsPort();
                 }
 
-                $url = $scheme.'://'.$this->context->getHost().$port.$url;
+                $url = $scheme.'://'.$host.$port.$url;
             }
         }
 

diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
@@ -68,6 +68,10 @@ public function dump(array $options = array())
 
             $rule = array("# $name");
 
+            if ($hostreq = $route->getRequirement('_host')) {
+                $rule[] = "RewriteCond %{HTTP_HOST} $hostreq";
+            }
+
             // method mismatch
             if ($req = $route->getRequirement('_method')) {
                 $methods = explode('|', strtoupper($req));

diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -179,6 +179,14 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
         if ($conditions) {
 EOF;
 
+        if ($hostreq = $route->getRequirement('_host')) {
+            $code[] = <<<EOF
+            if(\$this->context->getHost() !== '$hostreq') {
+                goto $gotoname;
+            }
+EOF;
+        }
+
         if ($req = $route->getRequirement('_method')) {
             $methods = explode('|', strtoupper($req));
             // GET and HEAD are equivalent
@@ -239,7 +247,7 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
         }
         $code[] = "        }";
 
-        if ($req) {
+        if ($req || $hostreq) {
             $code[] = "        $gotoname:";
         }
 

diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
@@ -112,6 +112,11 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
                 continue;
             }
 
+            // check host requirement
+            if (($req = $route->getRequirement('_host')) && $req !== $this->context->getHost()) {
+                    continue;
+            }
+
             // check HTTP method requirement
             if ($req = $route->getRequirement('_method')) {
                 // HEAD and GET are equivalent as per RFC

diff --git a/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher1.apache b/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher1.apache
@@ -6,6 +6,11 @@ RewriteRule .* - [QSA,L]
 RewriteCond %{REQUEST_URI} ^/foo/(baz|symfony)$
 RewriteRule .* app.php [QSA,L,E=_ROUTING__route:foo,E=_ROUTING_bar:%1,E=_ROUTING_def:test]
 
+# hostbar
+RewriteCond %{HTTP_HOST} example.org
+RewriteCond %{REQUEST_URI} ^/hostbar$
+RewriteRule .* app.php [QSA,L,E=_ROUTING__route:hostbar]
+
 # bar
 RewriteCond %{REQUEST_URI} ^/bar/([^/]+?)$
 RewriteCond %{REQUEST_METHOD} !^(GET|HEAD)$ [NC]

diff --git a/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher1.php b/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher1.php
@@ -41,6 +41,15 @@ public function match($pathinfo)
         }
         not_bar:
 
+        // barhost
+        if ($pathinfo === '/bar/') {
+            if($this->context->getHost() !== 'example.org') {
+                goto not_barhost;
+            }
+            return array('_route' => 'barhost');
+        }
+        not_barhost:
+
         // barhead
         if (0 === strpos($pathinfo, '/barhead') && preg_match('#^/barhead/(?P<foo>[^/]+?)$#xs', $pathinfo, $matches)) {
             if (!in_array($this->context->getMethod(), array('GET', 'HEAD'))) {

diff --git a/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher2.php b/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher2.php
@@ -41,6 +41,18 @@ public function match($pathinfo)
         }
         not_bar:
 
+        // barhost
+        if (rtrim($pathinfo, '/') === '/bar') {
+            if($this->context->getHost() !== 'example.org') {
+                goto not_barhost;
+            }
+            if (substr($pathinfo, -1) !== '/') {
+                return $this->redirect($pathinfo.'/', 'barhost');
+            }
+            return array('_route' => 'barhost');
+        }
+        not_barhost:
+
         // barhead
         if (0 === strpos($pathinfo, '/barhead') && preg_match('#^/barhead/(?P<foo>[^/]+?)$#xs', $pathinfo, $matches)) {
             if (!in_array($this->context->getMethod(), array('GET', 'HEAD'))) {

diff --git a/tests/Symfony/Tests/Component/Routing/Generator/UrlGeneratorTest.php b/tests/Symfony/Tests/Component/Routing/Generator/UrlGeneratorTest.php
@@ -18,6 +18,14 @@
 
 class UrlGeneratorTest extends \PHPUnit_Framework_TestCase
 {
+    public function testAbsoluteUrlWithHost()
+    {
+        $routes = $this->getRoutes('test', new Route( '/testing', array(), array('_host' => 'example.org')));
+        $url = $this->getGenerator($routes)->generate('test', array(), true);
+
+        $this->assertEquals('http://example.org/app.php/testing', $url);
+    }
+
     public function testAbsoluteUrlWithPort80()
     {
         $routes = $this->getRoutes('test', new Route('/testing'));

diff --git a/tests/Symfony/Tests/Component/Routing/Matcher/Dumper/ApacheMatcherDumperTest.php b/tests/Symfony/Tests/Component/Routing/Matcher/Dumper/ApacheMatcherDumperTest.php
diff --git a/tests/Symfony/Tests/Component/Routing/Matcher/Dumper/PhpMatcherDumperTest.php b/tests/Symfony/Tests/Component/Routing/Matcher/Dumper/PhpMatcherDumperTest.php
@@ -78,6 +78,12 @@ protected function getRouteCollection()
             array(),
             array('_method' => 'GET|head')
         ));
+        // host requirement
+        $collection->add('barhost', new Route(
+            '/bar/',
+            array(),
+            array('_host' => 'example.org')
+        ));
         // GET method requirement automatically adds HEAD as valid
         $collection->add('barhead', new Route(
             '/barhead/{foo}',

diff --git a/tests/Symfony/Tests/Component/Routing/Matcher/UrlMatcherTest.php b/tests/Symfony/Tests/Component/Routing/Matcher/UrlMatcherTest.php
@@ -29,6 +29,22 @@ public function testNoMethodSoAllowed()
         $matcher->match('/foo');
     }
 
+    public function testHostRequirement()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo', array(), array('_host' => 'example.org')));
+
+        $matcher = new UrlMatcher($coll, new RequestContext('', 'get', 'example.org'));
+        $this->assertEquals(array('_route' => 'foo'), $matcher->match('/foo'));
+
+        $matcher = new UrlMatcher($coll, new RequestContext('', 'get', 'other.host'));
+
+        try {
+            $matcher->match('/foo');
+            $this->fail();
+        } catch (ResourceNotFoundException $e) {}
+    }
+
     public function testMethodNotAllowed()
     {
         $coll = new RouteCollection();