feature #10112 [Routing] Add createRoute method for AnnotationClassLoader (henrikbjorn)

fabpot · fabpot · commit 774674efbf60 · 2014-01-25T11:05:55.000+01:00
This PR was merged into the 2.5-dev branch. Discussion ---------- [Routing] Add createRoute method for AnnotationClassLoader | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | ~ | License | MIT | Doc PR | ~ This allows to use a custom route class. So if you want to support annotations for Routing in Silex it can now be done while keeping the custom routing options Silex supports. Commits ------- 97404b3 Add createRoute method for AnnotationClassLoader
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
@@ -158,7 +158,7 @@ protected function addRoute(RouteCollection $collection, $annot, $globals, \Refl
             $condition = $globals['condition'];
         }
 
-        $route = new Route($globals['path'].$annot->getPath(), $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
+        $route = $this->createRoute($globals['path'].$annot->getPath(), $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
 
         $this->configureRoute($route, $class, $method, $annot);
 
@@ -259,5 +259,10 @@ protected function getGlobals(\ReflectionClass $class)
         return $globals;
     }
 
+    protected function createRoute($path, $defaults, $requirements, $options, $host, $schemes, $methods, $condition)
+    {
+        return new Route($path, $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
+    }
+
     abstract protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, $annot);
 }

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ protected function addRoute(RouteCollection $collection, $annot, $globals, \Refl`
`158`	`158`	`$condition = $globals['condition'];`
`159`	`159`	`}`
`160`	`160`
`161`		`- $route = new Route($globals['path'].$annot->getPath(), $defaults, $requirements, $options, $host, $schemes, $methods, $condition);`
	`161`	`+ $route = $this->createRoute($globals['path'].$annot->getPath(), $defaults, $requirements, $options, $host, $schemes, $methods, $condition);`
`162`	`162`
`163`	`163`	`$this->configureRoute($route, $class, $method, $annot);`
`164`	`164`
`@@ -259,5 +259,10 @@ protected function getGlobals(\ReflectionClass $class)`
`259`	`259`	`return $globals;`
`260`	`260`	`}`
`261`	`261`
	`262`	`+ protected function createRoute($path, $defaults, $requirements, $options, $host, $schemes, $methods, $condition)`
	`263`	`+ {`
	`264`	`+ return new Route($path, $defaults, $requirements, $options, $host, $schemes, $methods, $condition);`
	`265`	`+ }`
	`266`	`+`
`262`	`267`	`abstract protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, $annot);`
`263`	`268`	`}`