[Routing] added 'defaults' support in Annotation class loader

symfony · Sep 7, 2010 · b753ea4 · b753ea4
1 parent 1304940
commit b753ea4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/Symfony/Component/Routing/Annotation/Route.php b/src/Symfony/Component/Routing/Annotation/Route.php
@@ -22,6 +22,7 @@ class Route
     protected $name;
     protected $requirements;
     protected $options;
+    protected $defaults;
 
     /**
      * Constructor.
@@ -32,6 +33,7 @@ public function __construct(array $data)
     {
         $this->requirements = array();
         $this->options = array();
+        $this->defaults = array();
 
         if (isset($data['value'])) {
             $data['pattern'] = $data['value'];
@@ -86,4 +88,14 @@ public function getOptions()
     {
         return $this->options;
     }
+
+    public function setDefaults($defaults)
+    {
+        $this->defaults = $defaults;
+    }
+
+    public function getDefaults()
+    {
+        return $this->defaults;
+    }
 }
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
@@ -87,6 +87,7 @@ class_exists($annotClass = 'Symfony\\Component\\Routing\\Annotation\\Route');
             'pattern'      => '',
             'requirements' => array(),
             'options'      => array(),
+            'defaults'     => array(),
         );
 
         if ($annot = $this->reader->getClassAnnotation($class, $annotClass)) {
@@ -101,6 +102,10 @@ class_exists($annotClass = 'Symfony\\Component\\Routing\\Annotation\\Route');
             if (null !== $annot->getOptions()) {
                 $globals['options'] = $annot->getOptions();
             }
+
+            if (null !== $annot->getDefaults()) {
+                $globals['defaults'] = $annot->getDefaults();
+            }
         }
 
         $this->reader->setDefaultAnnotationNamespace('Symfony\\Component\\Routing\\Annotation\\');
@@ -111,7 +116,7 @@ class_exists($annotClass = 'Symfony\\Component\\Routing\\Annotation\\Route');
                     $annot->setName($this->getDefaultRouteName($class, $method));
                 }
 
-                $defaults = $this->getRouteDefaults($class, $method, $annot);
+                $defaults = array_merge($globals['defaults'], $annot->getDefaults(), $this->getRouteDefaults($class, $method, $annot));
                 $requirements = array_merge($globals['requirements'], $annot->getRequirements());
                 $options = array_merge($globals['options'], $annot->getOptions());