[Routing] Added tests for host requirement

symfony · sebhoerl · Dec 30, 2011 · Dec 30, 2011 · Dec 30, 2011 · Dec 30, 2011
commit 12bef9ff84391e60d0e982db8e20d4e439f2487a
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -181,9 +181,9 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
 
         if ($hostreq = $route->getRequirement('_host')) {
             $code[] = <<<EOF
-        if(\$this->context->getHost() !== '$hostreq') {
-            goto $gotoname;
-        }
+            if(\$this->context->getHost() !== '$hostreq') {
+                goto $gotoname;
+            }
 EOF;
         }
 

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:
+<
8000
/span>
         // 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
@@ -34,6 +34,12 @@ public function testDump()
             array('def' => 'test'),
             array('bar' => 'baz|symfony')
         ));
+        // host requirement
+        $collection->add('hostbar', new Route(
+            '/hostbar',
+            array(),
+            array('_host' => 'example.org')
+        ));
         // method requirement
         $collection->add('bar', new Route(
             '/bar/{foo}',

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,21 +29,20 @@ public function testNoMethodSoAllowed()
         $matcher->match('/foo');
     }
 
-    public function testHostRequirement() 
+    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' ) );    
+        $this->assertEquals(array('_route' => 'foo'), $matcher->match('/foo'));
 
+        $matcher = new UrlMatcher($coll, new RequestContext('', 'get', 'other.host'));
 
-        $matcher = new UrlMatcher($coll, new RequestContext('', 'get', 'other.host')); 
         try {
-            $matcher->match( '/foo' );
+            $matcher->match('/foo');
             $this->fail();
         } catch (ResourceNotFoundException $e) {}
-
     }
 
     public function testMethodNotAllowed()