Skip to content

Commit 48194cb

Browse files
dbudbu
committed
making configuration consistent
1 parent efb7f45 commit 48194cb

File tree

8 files changed

+29
-34
lines changed

8 files changed

+29
-34
lines changed

‎CmfRoutingBundle.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Symfony\Cmf\Bundle\RoutingBundle;
44

55
use Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass;
6-
use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass;
6+
use Symfony\Cmf\Bundle\CoreBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass;
77
use Symfony\Component\DependencyInjection\Definition;
88
use Symfony\Component\HttpKernel\Bundle\Bundle;
99
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -34,12 +34,13 @@ public function build(ContainerBuilder $container)
3434
realpath(__DIR__ . '/Resources/config/doctrine-model') => 'Symfony\Cmf\Bundle\RoutingBundle\Model',
3535
realpath(__DIR__ . '/Resources/config/doctrine-phpcr') => 'Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr',
3636
),
37-
array('cmf_routing.manager_name')
37+
array('cmf_routing.dynamic.persistence.phpcr.manager_name'),
38+
'cmf_routing.backend_type_phpcr'
3839
)
3940
);
4041
}
4142

42-
if (class_exists('Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass')) {
43+
if (class_exists('Symfony\Cmf\Bundle\CoreBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass')) {
4344
$container->addCompilerPass($this->buildBaseOrmCompilerPass());
4445
$container->addCompilerPass(
4546
DoctrineOrmMappingsPass::createXmlMappingDriver(
@@ -48,7 +49,7 @@ public function build(ContainerBuilder $container)
4849
realpath(__DIR__ . '/Resources/config/doctrine-orm') => 'Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm',
4950
),
5051
array('cmf_routing.dynamic.persistence.orm.manager_name'),
51-
'cmf_routing.persistence.orm.enabled'
52+
'cmf_routing.backend_type_orm'
5253
)
5354
);
5455
}
@@ -64,7 +65,7 @@ private function buildBaseOrmCompilerPass()
6465
$driver,
6566
array('Symfony\Component\Routing'),
6667
array('cmf_routing.dynamic.persistence.orm.manager_name'),
67-
'cmf_routing.persistence.orm.enabled'
68+
'cmf_routing.backend_type_orm'
6869
);
6970
}
7071

@@ -84,7 +85,7 @@ private function buildBasePhpcrCompilerPass()
8485
return new DoctrinePhpcrMappingsPass(
8586
$driver,
8687
array('Symfony\Component\Routing'),
87-
array('cmf_routing.manager_name'),
88+
array('cmf_routing.dynamic.persistence.phpcr.manager_name'),
8889
'cmf_routing.backend_type_phpcr'
8990
);
9091
}

‎DependencyInjection/CmfRoutingExtension.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ public function loadPhpcrProvider($config, XmlFileLoader $loader, ContainerBuild
148148

149149
$container->setParameter($this->getAlias() . '.backend_type_phpcr', true);
150150

151-
$container->setParameter($this->getAlias() . '.persistence.phpcr.route_basepath', $config['route_basepath']);
152-
$container->setParameter($this->getAlias() . '.persistence.phpcr.content_basepath', $config['content_basepath']);
151+
$container->setParameter($this->getAlias() . '.dynamic.persistence.phpcr.route_basepath', $config['route_basepath']);
152+
$container->setParameter($this->getAlias() . '.dynamic.persistence.phpcr.content_basepath', $config['content_basepath']);
153153

154-
$container->setParameter($this->getAlias() . '.manager_name', $config['manager_name']);
154+
$container->setParameter($this->getAlias() . '.dynamic.persistence.phpcr.manager_name', $config['manager_name']);
155155

156156
$container->setAlias($this->getAlias() . '.route_provider', $this->getAlias() . '.phpcr_route_provider');
157157
$container->setAlias($this->getAlias() . '.content_repository', $this->getAlias() . '.phpcr_content_repository');
@@ -179,8 +179,8 @@ public function loadSonataPhpcrAdmin($config, XmlFileLoader $loader, ContainerBu
179179

180180
public function loadOrmProvider($config, XmlFileLoader $loader, ContainerBuilder $container)
181181
{
182-
$container->setParameter($this->getAlias() . '.persistence.orm.manager_name', $config['manager_name']);
183-
$container->setParameter($this->getAlias() . '.persistence.orm.enabled', $config['enabled']);
182+
$container->setParameter($this->getAlias() . '.dynamic.persistence.orm.manager_name', $config['manager_name']);
183+
$container->setParameter($this->getAlias() . '.backend_type_orm', true);
184184
$loader->load('provider_orm.xml');
185185
}
186186

‎Doctrine/Orm/Route.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,4 @@ class Route extends RouteModel
1919
* {@inheritDoc}
2020
*/
2121
protected $position;
22-
23-
/**
24-
* {@inheritDoc}
25-
*/
26-
protected $addTrailingSlash;
2722
}

‎Resources/config/admin-phpcr.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
</call>
2626

2727
<call method="setContentRoot">
28-
<argument>%cmf_routing.persistence.phpcr.content_basepath%</argument>
28+
<argument>%cmf_routing.dynamic.persistence.phpcr.content_basepath%</argument>
2929
</call>
3030

3131
<call method="setRouteRoot">
32-
<argument>%cmf_routing.persistence.phpcr.route_basepath%</argument>
32+
<argument>%cmf_routing.dynamic.persistence.phpcr.route_basepath%</argument>
3333
</call>
3434
<call method="setControllerResolver">
3535
<argument type="service" id="controller_resolver" />
@@ -47,7 +47,7 @@
4747
</call>
4848

4949
<call method="setRouteRoot">
50-
<argument>%cmf_routing.persistence.phpcr.route_basepath%</argument>
50+
<argument>%cmf_routing.dynamic.persistence.phpcr.route_basepath%</argument>
5151
</call>
5252
</service>
5353

‎Resources/config/doctrine-model/Route.orm.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,15 @@
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="https://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
44

5-
<mapped-superclass name="Symfony\Cmf\Bundle\RoutingBundle\Model\Route" referenceable="true">
5+
<mapped-superclass name="Symfony\Cmf\Bundle\RoutingBundle\Model\Route">
66
<field name="variablePattern" type="string"/>
77
<field name="addFormatPattern" type="boolean"/>
8+
<field name="staticPrefix" type="string"/>
9+
10+
<indexes>
11+
<index name="name_idx" columns="name"/>
12+
<index name="prefix_idx" columns="staticPrefix"/>
13+
</indexes>
814
</mapped-superclass>
915

1016
</doctrine-mapping>

‎Resources/config/doctrine-orm/Route.orm.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,7 @@
99
</id>
1010

1111
<field name="name" type="string" unique="true"/>
12-
<field name="staticPrefix" type="string"/>
1312
<field name="position" type="integer"/>
14-
<field name="addTrailingSlash" type="boolean"/>
15-
16-
<indexes>
17-
<index name="name_idx" columns="name"/>
18-
<index name="prefix_idx" columns="staticPrefix"/>
19-
</indexes>
2013

2114
</entity>
2215

‎Resources/config/provider-phpcr.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@
1515
<service id="cmf_routing.phpcr_route_provider" class="%cmf_routing.phpcr_route_provider_class%">
1616
<argument type="service" id="doctrine_phpcr"/>
1717
<argument>%cmf_routing.route_model_class%</argument>
18-
<call method="setManagerName"><argument>%cmf_routing.manager_name%</argument></call>
19-
<call method="setPrefix"><argument>%cmf_routing.persistence.phpcr.route_basepath%</argument></call>
18+
<call method="setManagerName"><argument>%cmf_routing.dynamic.persistence.phpcr.manager_name%</argument></call>
19+
<call method="setPrefix"><argument>%cmf_routing.dynamic.persistence.phpcr.route_basepath%</argument></call>
2020
</service>
2121

2222
<service id="cmf_routing.phpcr_content_repository" class="%cmf_routing.content_repository_class%">
2323
<argument type="service" id="doctrine_phpcr"/>
24-
<call method="setManagerName"><argument>%cmf_routing.manager_name%</argument></call>
24+
<call method="setManagerName"><argument>%cmf_routing.dynamic.persistence.phpcr.manager_name%</argument></call>
2525
</service>
2626

2727
<service id="cmf_routing.phpcrodm_route_idprefix_listener" class="%cmf_routing.phpcrodm_route_idprefix_listener_class%">
28-
<argument>%cmf_routing.persistence.phpcr.route_basepath%</argument>
28+
<argument>%cmf_routing.dynamic.persistence.phpcr.route_basepath%</argument>
2929
<tag name="doctrine_phpcr.event_listener" event="postLoad" />
3030
<tag name="doctrine_phpcr.event_listener" event="postPersist" />
3131
</service>
3232

3333
<service id="cmf_routing.phpcrodm_route_locale_listener" class="%cmf_routing.phpcrodm_route_locale_listener_class%">
34-
<argument>%cmf_routing.persistence.phpcr.route_basepath%</argument>
34+
<argument>%cmf_routing.dynamic.persistence.phpcr.route_basepath%</argument>
3535
<argument>%cmf_routing.locales%</argument>
3636
<tag name="doctrine_phpcr.event_listener" event="postLoad" />
3737
<tag name="doctrine_phpcr.event_listener" event="postPersist" />
@@ -40,7 +40,7 @@
4040

4141
<service id="cmf_routing.initializer" class="Doctrine\Bundle\PHPCRBundle\Initializer\GenericInitializer">
4242
<argument type="collection">
43-
<argument>%cmf_routing.persistence.phpcr.route_basepath%</argument>
43+
<argument>%cmf_routing.dynamic.persistence.phpcr.route_basepath%</argument>
4444
</argument>
4545
<tag name="doctrine_phpcr.initializer"/>
4646
</service>

‎Resources/config/provider_orm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<service id="cmf_routing.route_provider" class="%cmf_routing.route_entity_provider%">
1919
<argument type="service" id="doctrine"/>
2020
<argument>%cmf_routing.route_entity_class%</argument>
21-
<call method="setManagerName"><argument>%cmf_routing.persistence.orm.manager_name%</argument></call>
21+
<call method="setManagerName"><argument>%cmf_routing.dynamic.persistence.orm.manager_name%</argument></call>
2222
</service>
2323
</services>
2424
</container>

0 commit comments

Comments
 (0)