support candidates limit

symfony-cmf · Mar 31, 2014 · a1205ec · lsmith77 · Mar 31, 2014 · wouterj
1 parent b6729db
commit a1205ec
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 2 deletions.
diff --git a/DependencyInjection/CmfRoutingExtension.php b/DependencyInjection/CmfRoutingExtension.php
@@ -100,6 +100,7 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
             $container->setParameter($this->getAlias() . '.dynamic.locales', $locales);
             $container->setParameter($this->getAlias() . '.dynamic.auto_locale_pattern', $config['auto_locale_pattern']);
         }
+        $container->setParameter($this->getAlias() . '.dynamic.limit_candidates', $config['limit_candidates']);
 
         $loader->load('routing-dynamic.xml');
 

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -131,6 +131,7 @@ public function getConfigTreeBuilder()
                         ->arrayNode('locales')
                             ->prototype('scalar')->end()
                         ->end()
+                        ->scalarNode('limit_candidates')->defaultValue(20)->end()
                         ->booleanNode('match_implicit_locale')->defaultValue(true)->end()
                         ->booleanNode('auto_locale_pattern')->defaultValue(false)->end()
                     ->end()

diff --git a/Doctrine/Phpcr/PrefixCandidates.php b/Doctrine/Phpcr/PrefixCandidates.php
@@ -50,10 +50,11 @@ class PrefixCandidates extends Candidates
      *                                  $locales. This must be the same
      *                                  document manager as the RouteProvider
      *                                  is using.
+     * @param int             $limit    Limit to candidates generated per prefix.
      */
-    public function __construct(array $prefixes, array $locales = array(), ManagerRegistry $doctrine = null)
+    public function __construct(array $prefixes, array $locales = array(), ManagerRegistry $doctrine = null, $limit = 20)
     {
-        parent::__construct($locales);
+        parent::__construct($locales, $limit);
         $this->setPrefixes($prefixes);
         $this->doctrine = $doctrine;
     }

diff --git a/Resources/config/provider-orm.xml b/Resources/config/provider-orm.xml
@@ -19,6 +19,7 @@
 
         <service id="cmf_routing.orm_candidates" class="%cmf_routing.orm_candidates.class%">
             <argument>%cmf_routing.dynamic.locales%</argument>
+            <argument>%cmf_routing.dynamic.limit_candidates%</argument>
         </service>
 
         <service id="cmf_routing.route_provider" class="%cmf_routing.route_entity_provider%">

diff --git a/Resources/config/provider-phpcr.xml b/Resources/config/provider-phpcr.xml
@@ -25,6 +25,7 @@
             <argument>%cmf_routing.dynamic.persistence.phpcr.route_basepaths%</argument>
             <argument>%cmf_routing.dynamic.locales%</argument>
             <argument type="service" id="doctrine_phpcr"/>
+            <argument>%cmf_routing.dynamic.limit_candidates%</argument>
             <call method="setManagerName"><argument>%cmf_routing.dynamic.persistence.phpcr.manager_name%</argument></call>
         </service>
 

diff --git a/Tests/Unit/DependencyInjection/ConfigurationTest.php b/Tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -71,6 +71,7 @@ public function testSupportsAllConfigFormats()
                 'uri_filter_regexp' => '',
                 'route_filters_by_id' => array(),
                 'locales' => array('en', 'fr'),
+                'limit_candidates' => true,
                 'auto_locale_pattern' => true,
                 'match_implicit_locale' => true,
             ),