[Routing] added hostname matching support to AnnotationClassLoader

symfony · Nov 12, 2012 · 7a15e00 · 7a15e00
1 parent cab450c
commit 7a15e00
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/src/Symfony/Component/Routing/Annotation/Route.php b/src/Symfony/Component/Routing/Annotation/Route.php
@@ -25,6 +25,7 @@ class Route
     private $requirements;
     private $options;
     private $defaults;
+    private $hostnamePattern;
 
     /**
      * Constructor.
@@ -61,6 +62,16 @@ public function getPattern()
         return $this->pattern;
     }
 
+    public function setHostnamePattern($pattern)
+    {
+        $this->hostnamePattern = $pattern;
+    }
+
+    public function getHostnamePattern()
+    {
+        return $this->hostnamePattern;
+    }
+
     public function setName($name)
     {
         $this->name = $name;

diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
@@ -97,10 +97,11 @@ public function load($class, $type = null)
         }
 
         $globals = array(
-            'pattern'      => '',
-            'requirements' => array(),
-            'options'      => array(),
-            'defaults'     => array(),
+            'pattern'           => '',
+            'requirements'      => array(),
+            'options'           => array(),
+            'defaults'          => array(),
+            'hostname_pattern'  => null,
         );
 
         $class = new \ReflectionClass($class);
@@ -124,6 +125,10 @@ public function load($class, $type = null)
             if (null !== $annot->getDefaults()) {
                 $globals['defaults'] = $annot->getDefaults();
             }
+
+            if (null !== $annot->getHostnamePattern()) {
+                $globals['hostname_pattern'] = $annot->getHostnamePattern();
+            }
         }
 
         $collection = new RouteCollection();
@@ -157,7 +162,12 @@ protected function addRoute(RouteCollection $collection, $annot, $globals, \Refl
         $requirements = array_merge($globals['requirements'], $annot->getRequirements());
         $options = array_merge($globals['options'], $annot->getOptions());
 
-        $route = new Route($globals['pattern'].$annot->getPattern(), $defaults, $requirements, $options);
+        $hostnamePattern = $annot->getHostnamePattern();
+        if (null === $hostnamePattern) {
+            $hostnamePattern = $globals['hostname_pattern'];
+        }
+
+        $route = new Route($globals['pattern'].$annot->getPattern(), $defaults, $requirements, $options, $hostnamePattern);
 
         $this->configureRoute($route, $class, $method, $annot);