aligned configuration with other Bundles

Author: lsmith77

CHANGELOG.md

@@ -1,6 +1,7 @@
 Changelog
 =========
 
+* **2013-07-29**: [DependencyInjection] restructured `phpcr_provider` config into `persistence` -> `phpcr` to match other Bundles
 * **2013-07-28**: [DependencyInjection] added `enabled` flag to `phpcr_provider` config
 * **2013-07-26**: [Model] Deprecated setRouteContent and getRouteContent, use setContent and getContent instead.
 * **2013-07-19**: [Model] Separated database agnostic, doctrine generic and

DependencyInjection/CmfRoutingExtension.php

@@ -88,8 +88,8 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
 
         $hasProvider = false;
         $hasContentRepository = false;
-        if (!empty($config['phpcr_provider']['enabled'])) {
-            $this->loadPhpcrProvider($config['phpcr_provider'], $loader, $container);
+        if (!empty($config['persistence']['phpcr']['enabled'])) {
+            $this->loadPhpcrProvider($config['persistence']['phpcr'], $loader, $container);
             $hasProvider = true;
             $hasContentRepository = true;
         }

DependencyInjection/Configuration.php

@@ -58,15 +58,19 @@ public function getConfigTreeBuilder()
                             ->useAttributeAsKey('alias')
                             ->prototype('scalar')->end()
                         ->end()
-                        ->arrayNode('phpcr_provider')
+                        ->arrayNode('persistence')
                             ->children()
-                                ->scalarNode('enabled')->defaultNull()->end()
-                                ->scalarNode('manager_name')->defaultNull()->end()
-                                ->scalarNode('route_basepath')->defaultValue('/cms/routes')->end()
-                                ->scalarNode('content_basepath')->defaultValue('/cms/content')->end()
-                                ->enumNode('use_sonata_admin')
-                                    ->values(array(true, false, 'auto'))
-                                    ->defaultValue('auto')
+                                ->arrayNode('phpcr')
+                                    ->children()
+                                        ->scalarNode('enabled')->defaultNull()->end()
+                                        ->scalarNode('manager_name')->defaultNull()->end()
+                                        ->scalarNode('route_basepath')->defaultValue('/cms/routes')->end()
+                                        ->scalarNode('content_basepath')->defaultValue('/cms/content')->end()
+                                        ->enumNode('use_sonata_admin')
+                                            ->values(array(true, false, 'auto'))
+                                            ->defaultValue('auto')
+                                        ->end()
+                                    ->end()
                                 ->end()
                             ->end()
                         ->end()

Tests/DependencyInjection/CmfRoutingExtensionTest.php

@@ -28,9 +28,11 @@ public function testLoadDefault()
             array(
                 array(
                     'dynamic' => array(
-                        'phpcr_provider' => array(
-                            'enabled' => true,
-                            'use_sonata_admin' => false,
+                        'persistence' => array(
+                            'phpcr' => array(
+                                'enabled' => true,
+                                'use_sonata_admin' => false,
+                            ),
                         ),
                     ),
                 )
@@ -79,8 +81,10 @@ public function testLoadConfigured()
                 'dynamic' => array(
                     'route_provider_service_id' => 'test_route_provider_service',
                     'content_repository_service_id' => 'test_content_repository_service',
-                    'phpcr_provider' => array(
-                        'use_sonata_admin' => false,
+                    'persistence' => array(
+                        'phpcr' => array(
+                            'use_sonata_admin' => false,
+                        ),
                     ),
                 ),
                 'chain' => array(

Tests/Functional/config/cmf-routing.yml

@@ -11,6 +11,7 @@ cmf_routing:
             Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute:  cmf_routing.redirect_controller:redirectAction
         templates_by_class:
             Symfony\Cmf\Bundle\RoutingBundle\Tests\Functional\Testdoc\Content: TestBundle:Content:index.html.twig
-        phpcr_provider:
-            enabled: true
-            route_basepath: /test/routing
+        persistence:
+            phpcr:
+                enabled: true
+                route_basepath: /test/routing

UPGRADE-1.1.md

@@ -7,15 +7,16 @@ Deprecated `RoutingBundle\Document\Route` and `RedirectRoute` in favor of
 PHPCR specific configurations moved into
 
     dynamic:
-        phpcr_provider:
-            enabled: true
-            # the rest is optional, the defaults are
-            route_basepath: ~
-            manager_name: ~
-            content_basepath: ~
-            use_sonata_admin: auto
+        persistence:
+            phpcr:
+                enabled: true
+                # the rest is optional, the defaults are
+                route_basepath: ~
+                manager_name: ~
+                content_basepath: ~
+                use_sonata_admin: auto
 
-You need to at least set `phpcr_provider.enabled: true` to have the PHPCR provider loaded.
+You need to at least set `persistence.phpcr.enabled: true` to have the PHPCR provider loaded.
 
 Dropped redundant unused `routing_repositoryroot` configuration.