Skip to content

Commit fce8e56

Browse files
committed
Merge pull request #242 from symfony-cmf/route_collection_limit
set the route_collection_limit to 0 by default for BC
2 parents a247ae0 + bf33b4d commit fce8e56

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Changelog
44
1.2.0-RC2
55
---------
66

7+
* **2014-04-23**: changed ``cmf_routing.dynamic.route_collection_limit`` default to ``0``
8+
79
* **2014-04-15**: Removed the unused ContentAwareGenerator class from the
810
bundle. Since 1.1 the one from the routing component was used.
911

@@ -33,6 +35,9 @@ Changelog
3335
* **2014-03-23**: When using PHPCR-ODM, routes can now be generated with their
3436
uuid as route name as well, in addition to the repository path.
3537

38+
* **2013-12-23**: add support for ChainRouter::getRouteCollection(), added new
39+
config setting ``cmf_routing.dynamic.route_collection_limit``
40+
3641
* **2013-11-28**: [BC BREAK for xml configuration] the alias attribute of the
3742
<template-by-class> is renamed to class in the bundle configuration.
3843

DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function getConfigTreeBuilder()
5656
->addDefaultsIfNotSet()
5757
->canBeEnabled()
5858
->children()
59-
->scalarNode('route_collection_limit')->defaultNull()->end()
59+
->scalarNode('route_collection_limit')->defaultValue(0)->end()
6060
->scalarNode('generic_controller')->defaultNull()->end()
6161
->scalarNode('default_controller')->defaultNull()->end()
6262
->arrayNode('controllers_by_type')

Tests/Unit/DependencyInjection/ConfigurationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function testSupportsAllConfigFormats()
3939
'replace_symfony_router' => true,
4040
),
4141
'dynamic' => array(
42-
'route_collection_limit' => null,
42+
'route_collection_limit' => 0,
4343
'generic_controller' => 'acme_main.controller:mainAction',
4444
'controllers_by_type' => array(
4545
'editable' => 'acme_main.some_controller:editableAction',

0 commit comments

Comments
 (0)