Skip to content

Commit 5b613d7

Browse files
committed
default manager_name is null, solve TODO about phpcr enabled
1 parent 7896ad8 commit 5b613d7

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

CmfRoutingBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ private function buildBasePhpcrCompilerPass()
5656
$driver,
5757
array('Symfony\Component\Routing'),
5858
array('cmf_routing.manager_name'),
59-
false // TODO: once we have config for orm or phpcr-odm, configure the enabled parameter
59+
'cmf_routing.backend_type_phpcr'
6060
);
6161
}
6262
}

DependencyInjection/CmfRoutingExtension.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ public function loadPhpcrProvider($config, XmlFileLoader $loader, ContainerBuild
130130
{
131131
$loader->load('provider_phpcr.xml');
132132

133+
$container->setParameter($this->getAlias() . '.backend_type_phpcr', true);
134+
133135
$container->setParameter($this->getAlias() . '.phpcr_provider.route_basepath', $config['route_basepath']);
134136
$container->setParameter($this->getAlias() . '.phpcr_provider.content_basepath', $config['content_basepath']);
135137

DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function getConfigTreeBuilder()
6161
->arrayNode('phpcr_provider')
6262
->children()
6363
->scalarNode('manager_registry')->defaultValue('doctrine_phpcr')->end()
64-
->scalarNode('manager_name')->defaultValue('default')->end()
64+
->scalarNode('manager_name')->defaultNull()->end()
6565
->scalarNode('route_basepath')->defaultValue('/cms/routes')->end()
6666
->scalarNode('content_basepath')->defaultValue('/cms/content')->end()
6767
->enumNode('use_sonata_admin')

0 commit comments

Comments
 (0)