Add route options to routing loader

liip · Feb 7, 2013 · 59cf07b · 59cf07b
1 parent 0586dd3
commit 59cf07b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -51,6 +51,14 @@ public function getConfigTreeBuilder()
                             ->scalarNode('cache')->defaultNull()->end()
                             ->scalarNode('data_loader')->defaultNull()->end()
                             ->scalarNode('controller_action')->defaultNull()->end()
+                            ->arrayNode('route')
+                                ->defaultValue(array())
+                                ->useAttributeAsKey('name')
+                                ->prototype('array')
+                                    ->useAttributeAsKey('name')
+                                    ->prototype('variable')->end()
+                                ->end()
+                            ->end()
                             ->arrayNode('filters')
                                 ->useAttributeAsKey('name')
                                 ->prototype('array')

diff --git a/Routing/ImagineLoader.php b/Routing/ImagineLoader.php
@@ -46,10 +46,25 @@ public function load($resource, $type = null)
                     'filter' => $filter,
                 );
 
+                $routeRequirements = $requirements;
+                $routeDefaults = $defaults;
+                $routeOptions = array();
+
+                if(isset($config['route']['requirements'])) {
+                    $routeRequirements = array_merge($routeRequirements, $config['route']['requirements']);
+                }
+                if(isset($config['route']['defaults'])) {
+                    $routeDefaults = array_merge($routeDefaults, $config['route']['defaults']);
+                }
+                if(isset($config['route']['options'])) {
+                    $routeOptions = array_merge($routeOptions, $config['route']['options']);
+                }
+
                 $routes->add('_imagine_'.$filter, new Route(
                     $pattern.'/{path}',
-                    $defaults,
-                    $requirements
+                    $routeDefaults,
+                    $routeRequirements,
+                    $routeOptions
                 ));
             }
         }