Added PHPCR route basepath option

Author: wouterj

DependencyInjection/CmfRoutingAutoExtension.php

@@ -47,6 +47,10 @@ public function load(array $configs, ContainerBuilder $container)
             $paths[] = $path;
         }
         $container->setParameter('cmf_routing_auto.mapping.loader.resources', $paths);
+
+        if ($this->isConfigEnabled($container, $config['persistence']['phpcr'])) {
+            $container->setParameter('cmf_routing_auto.persistence.phpcr.route_basepath', $config['persistence']['phpcr']['route_basepath']);
+        }
     }
 
     protected function findMappingFiles($bundles)

DependencyInjection/Configuration.php

@@ -44,8 +44,29 @@ public function getConfigTreeBuilder()
                         ->end() // directories
                     ->end()
                 ->end() // mapping
+                ->append($this->getPersistenceNode())
             ->end();
 
         return $treeBuilder;
     }
+
+    protected function getPersistenceNode()
+    {
+        $builder = new TreeBuilder();
+        $persistence = $builder->root('persistence');
+
+        $persistence
+            ->addDefaultsIfNotSet()
+            ->children()
+                ->arrayNode('phpcr')
+                    ->addDefaultsIfNotSet()
+                    ->canBeEnabled()
+                    ->children()
+                        ->scalarNode('route_basepath')->defaultValue('/cms/routes')->end()
+                    ->end()
+                ->end() // phpcr
+            ->end();
+
+        return $persistence;
+    }
 }

Resources/config/schema/routing-auto-1.0.xsd

@@ -10,11 +10,23 @@
     <xsd:complexType name="config">
         <xsd:sequence>
             <xsd:element name="mapping" type="mapping" minOccurs="0" />
+            <xsd:element name="persistence" type="persistence" minOccurs="0" />
         </xsd:sequence>
 
         <xsd:attribute name="auto-mapping" type="xsd:boolean" />
     </xsd:complexType>
 
+    <xsd:complexType name="persistence">
+        <xsd:sequence>
+            <xsd:element name="phpcr">
+                <xsd:complexType>
+                    <xsd:attribute name="enabled" type="xsd:boolean" />
+                    <xsd:attribute name="route-basepath" type="xsd:string" />
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+
     <xsd:complexType name="mapping">
         <xsd:sequence>
             <xsd:element name="path" type="path" minOccurs="0" maxOccurs="unbounded" />

Tests/Resources/Fixtures/config/config.php

@@ -9,4 +9,9 @@
             array('path' => 'Resources/config/foo.xml'),
         ),
     ),
+    'persistence' => array(
+        'phpcr' => array(
+            'route_basepath' => '/routes',
+        ),
+    ),
 ));

Tests/Resources/Fixtures/config/config.xml

@@ -9,5 +9,9 @@
             <path path="Document/Post.php" type="annotation" />
             <path path="Resources/config/foo.xml" />
         </mapping>
+
+        <persistence>
+            <phpcr route-basepath="/routes" />
+        </persistence>
     </config>
 </container>

Tests/Resources/Fixtures/config/config.yml

@@ -5,3 +5,6 @@ cmf_routing_auto:
             - Resources/config/SpecificObject.yml
             - { path: Document/Post.php, type: annotation }
             - { path: Resources/config/foo.xml }
+    persistence:
+        phpcr:
+            route_basepath: /routes

Tests/Resources/Fixtures/config/config2.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services">
+
+    <config xmlns="http://cmf.symfony.com/schema/dic/routing_auto">
+
+        <persistence>
+            <phpcr enabled="true" />
+        </persistence>
+    </config>
+</container>

Tests/Resources/Fixtures/config/config3.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services">
+
+    <config xmlns="http://cmf.symfony.com/schema/dic/routing_auto">
+
+        <persistence>
+            <phpcr />
+        </persistence>
+    </config>
+</container>

Tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -38,6 +38,12 @@ public function testSupportsAllConfigFormats()
                     array('path' => 'Resources/config/foo.xml', 'type' => null),
                 ),
             ),
+            'persistence' => array(
+                'phpcr' => array(
+                    'enabled' => true,
+                    'route_basepath' => '/routes',
+                ),
+            ),
         );
 
         $sources = array_map(function ($path) {

Tests/Unit/DependencyInjection/XmlSchemaTest.php

@@ -20,8 +20,10 @@ public function testSchema()
         $xmlFiles = array_map(function ($file) {
             return __DIR__.'/../../Resources/Fixtures/config/'.$file;
         }, array(
-            'config1.xml',
             'config.xml',
+            'config1.xml',
+            'config2.xml',
+            'config3.xml',
         ));
 
         $this->assertSchemaAcceptsXml($xmlFiles, __DIR__.'/../../../Resources/config/schema/routing-auto-1.0.xsd');