Skip to content

Commit 9fbe611

Browse files
lsmith77lsmith77
committed
Merge pull request #172 from WouterJ/fix_things
Fixed some small standards things
2 parents 8d75d9c + fa18466 commit 9fbe611

File tree

8 files changed

+75
-62
lines changed

8 files changed

+75
-62
lines changed

‎DependencyInjection/CmfRoutingExtension.php

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function load(array $configs, ContainerBuilder $container)
2525
$config = $this->processConfiguration(new Configuration(), $configs);
2626
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
2727

28-
if (!empty($config['dynamic']['enabled'])) {
28+
if ($config['dynamic']['enabled']) {
2929
// load this even if no explicit enabled value but some configuration
3030
$this->setupDynamicRouter($config['dynamic'], $container, $loader);
3131
}
@@ -88,13 +88,17 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
8888

8989
$hasProvider = false;
9090
$hasContentRepository = false;
91-
if (!empty($config['persistence']['phpcr']['enabled'])) {
91+
if ($config['persistence']['phpcr']['enabled'] && $config['persistence']['orm']['enabled']) {
92+
throw new InvalidConfigurationException('You can only enable either phpcr or orm, not both.');
93+
}
94+
95+
if ($config['persistence']['phpcr']['enabled']) {
9296
$this->loadPhpcrProvider($config['persistence']['phpcr'], $loader, $container, $locales);
9397
$hasProvider = true;
9498
$hasContentRepository = true;
9599
}
96100

97-
if (!empty($config['persistence']['orm']['enabled'])) {
101+
if ($config['persistence']['orm']['enabled']) {
98102
$this->loadOrmProvider($config['persistence']['orm'], $loader, $container);
99103
$hasProvider = true;
100104
}
@@ -122,17 +126,17 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
122126

123127
// if any mappings are defined, set the respective route enhancer
124128
if (!empty($config['generic_controller'])) {
125-
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer_explicit_template')));
129+
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer.explicit_template')));
126130
}
127131
if (!empty($config['controllers_by_type'])) {
128-
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer_controllers_by_type')));
132+
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer.controllers_by_type')));
129133
}
130134
if (!empty($config['controllers_by_class'])) {
131-
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer_controllers_by_class')));
135+
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer.controllers_by_class')));
132136
}
133137

134138
if (!empty($config['templates_by_class'])) {
135-
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer_templates_by_class')));
139+
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer.templates_by_class')));
136140

137141
if (null === $config['generic_controller']) {
138142
throw new InvalidConfigurationException('If you configure templates_by_class, you need to configure a generic_router. If you are sure you do not need a generic router, set the field to false to disable explicitly.');
@@ -145,10 +149,10 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
145149
$controllerForTemplates[$key] = $config['generic_controller'];
146150
}
147151

148-
$definition = $container->getDefinition($this->getAlias() . '.enhancer_controller_for_templates_by_class');
152+
$definition = $container->getDefinition($this->getAlias() . '.enhancer.controller_for_templates_by_class');
149153
$definition->replaceArgument(2, $controllerForTemplates);
150154

151-
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer_controller_for_templates_by_class')));
155+
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer.controller_for_templates_by_class')));
152156
}
153157
}
154158

@@ -197,7 +201,7 @@ public function loadOrmProvider($config, XmlFileLoader $loader, ContainerBuilder
197201
{
198202
$container->setParameter($this->getAlias() . '.dynamic.persistence.orm.manager_name', $config['manager_name']);
199203
$container->setParameter($this->getAlias() . '.backend_type_orm', true);
200-
$loader->load('provider_orm.xml');
204+
$loader->load('provider-orm.xml');
201205
}
202206

203207
/**

‎DependencyInjection/Configuration.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ public function getConfigTreeBuilder()
4343
->fixXmlConfig('template_by_class', 'templates_by_class')
4444
->fixXmlConfig('route_filter_by_id', 'route_filters_by_id')
4545
->fixXmlConfig('locale')
46+
->addDefaultsIfNotSet()
4647
->children()
47-
->scalarNode('enabled')->defaultNull()->end()
48+
->booleanNode('enabled')->defaultFalse()->end()
4849
->scalarNode('generic_controller')->defaultNull()->end()
4950
->arrayNode('controllers_by_type')
5051
->useAttributeAsKey('type')
@@ -59,10 +60,12 @@ public function getConfigTreeBuilder()
5960
->prototype('scalar')->end()
6061
->end()
6162
->arrayNode('persistence')
63+
->addDefaultsIfNotSet()
6264
->children()
6365
->arrayNode('phpcr')
66+
->addDefaultsIfNotSet()
6467
->children()
65-
->scalarNode('enabled')->defaultNull()->end()
68+
->booleanNode('enabled')->defaultFalse()->end()
6669
->scalarNode('manager_name')->defaultNull()->end()
6770
->scalarNode('route_basepath')->defaultValue('/cms/routes')->end()
6871
->scalarNode('content_basepath')->defaultValue('/cms/content')->end()
@@ -73,8 +76,9 @@ public function getConfigTreeBuilder()
7376
->end()
7477
->end()
7578
->arrayNode('orm')
79+
->addDefaultsIfNotSet()
7680
->children()
77-
->scalarNode('enabled')->defaultNull()->end()
81+
->booleanNode('enabled')->defaultFalse()->end()
7882
->scalarNode('manager_name')->defaultNull()->end()
7983
->end()
8084
->end()

‎Resources/config/admin-phpcr.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

77
<parameters>
8-
<parameter key="cmf_routing.route_admin_class">Symfony\Cmf\Bundle\RoutingBundle\Admin\RouteAdmin</parameter>
9-
<parameter key="cmf_routing.redirect_route_admin_class">Symfony\Cmf\Bundle\RoutingBundle\Admin\RedirectRouteAdmin</parameter>
10-
<parameter key="cmf_routing.route_document_class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route</parameter>
11-
<parameter key="cmf_routing.redirect_route_document_class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute</parameter>
8+
<parameter key="cmf_routing.route_admin.class">Symfony\Cmf\Bundle\RoutingBundle\Admin\RouteAdmin</parameter>
9+
<parameter key="cmf_routing.redirect_route_admin.class">Symfony\Cmf\Bundle\RoutingBundle\Admin\RedirectRouteAdmin</parameter>
10+
<parameter key="cmf_routing.route_document.class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route</parameter>
11+
<parameter key="cmf_routing.redirect_route_document.class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute</parameter>
1212
<parameter key="cmf_routing.admin_extension.route_referrers.class">Symfony\Cmf\Bundle\RoutingBundle\Admin\Extension\RouteReferrersExtension</parameter>
1313
</parameters>
1414

1515
<services>
1616

17-
<service id="cmf_routing.route_admin" class="%cmf_routing.route_admin_class%">
17+
<service id="cmf_routing.route_admin" class="%cmf_routing.route_admin.class%">
1818
<tag name="sonata.admin" manager_type="doctrine_phpcr" group="dashboard.cmf" label_catalogue="CmfRoutingBundle" label="dashboard.label_routing" label_translator_strategy="sonata.admin.label.strategy.underscore" />
1919
<argument/>
20-
<argument>%cmf_routing.route_document_class%</argument>
20+
<argument>%cmf_routing.route_document.class%</argument>
2121
<argument>SonataAdminBundle:CRUD</argument>
2222

2323
<call method="setRouteBuilder">
@@ -36,10 +36,10 @@
3636
</call>
3737
</service>
3838

39-
<service id="cmf_routing.redirect_route_admin" class="%cmf_routing.redirect_route_admin_class%">
39+
<service id="cmf_routing.redirect_route_admin" class="%cmf_routing.redirect_route_admin.class%">
4040
<tag name="sonata.admin" manager_type="doctrine_phpcr" group="dashboard.cmf" label_catalogue="CmfRoutingBundle" label="dashboard.label_redirect_routing" label_translator_strategy="sonata.admin.label.strategy.underscore" />
4141
<argument/>
42-
<argument>%cmf_routing.redirect_route_document_class%</argument>
42+
<argument>%cmf_routing.redirect_route_document.class%</argument>
4343
<argument>SonataAdminBundle:CRUD</argument>
4444

4545
<call method="setRouteBuilder">

‎Resources/config/form-type.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
55

66
<parameters>
7-
<parameter key="cmf_routing.route_type_type_class">Symfony\Cmf\Bundle\RoutingBundle\Form\Type\RouteTypeType</parameter>
7+
<parameter key="cmf_routing.route_type_type.class">Symfony\Cmf\Bundle\RoutingBundle\Form\Type\RouteTypeType</parameter>
88
</parameters>
99

1010
<services>
11-
<service id="cmf_routing.route_type_form_type" class="%cmf_routing.route_type_type_class%">
11+
<service id="cmf_routing.route_type_form_type" class="%cmf_routing.route_type_type.class%">
1212
<tag name="form.type" alias="cmf_routing_route_type" />
1313
</service>
1414
</services>

‎Resources/config/provider_orm.xml renamed to ‎Resources/config/provider-orm.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
55

66
<parameters>
7-
<parameter key="cmf_routing.route_entity_class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm\Route</parameter>
7+
<parameter key="cmf_routing.route_entity.class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm\Route</parameter>
88
<parameter key="cmf_routing.route_entity_provider">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm\RouteProvider</parameter>
9-
<parameter key="cmf_routing.orm.content_repository_class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm\ContentRepository</parameter>
9+
<parameter key="cmf_routing.orm.content_repository.class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm\ContentRepository</parameter>
1010
</parameters>
1111

1212
<services>
1313

14-
<service id="cmf_routing.content_repository" class="%cmf_routing.orm.content_repository_class%">
14+
<service id="cmf_routing.content_repository" class="%cmf_routing.orm.content_repository.class%">
1515
<argument type="service" id="doctrine.orm.default_entity_manager" />
1616
</service>
1717

1818
<service id="cmf_routing.route_provider" class="%cmf_routing.route_entity_provider%">
1919
<argument type="service" id="doctrine"/>
20-
<argument>%cmf_routing.route_entity_class%</argument>
20+
<argument>%cmf_routing.route_entity.class%</argument>
2121
<call method="setManagerName"><argument>%cmf_routing.dynamic.persistence.orm.manager_name%</argument></call>
2222
</service>
2323
</services>

‎Resources/config/provider-phpcr.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,33 @@
44
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
55

66
<parameters>
7-
<parameter key="cmf_routing.phpcr_route_provider_class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RouteProvider</parameter>
8-
<parameter key="cmf_routing.content_repository_class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\ContentRepository</parameter>
9-
<parameter key="cmf_routing.phpcrodm_route_idprefix_listener_class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\IdPrefixListener</parameter>
10-
<parameter key="cmf_routing.phpcrodm_route_locale_listener_class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\LocaleListener</parameter>
7+
<parameter key="cmf_routing.phpcr_route_provider.class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RouteProvider</parameter>
8+
<parameter key="cmf_routing.content_repository.class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\ContentRepository</parameter>
9+
<parameter key="cmf_routing.phpcrodm_route_idprefix_listener.class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\IdPrefixListener</parameter>
10+
<parameter key="cmf_routing.phpcrodm_route_locale_listener.class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\LocaleListener</parameter>
1111
</parameters>
1212

1313
<services>
1414

15-
<service id="cmf_routing.phpcr_route_provider" class="%cmf_routing.phpcr_route_provider_class%">
15+
<service id="cmf_routing.phpcr_route_provider" class="%cmf_routing.phpcr_route_provider.class%">
1616
<argument type="service" id="doctrine_phpcr"/>
17-
<argument>%cmf_routing.route_model_class%</argument>
17+
<argument>%cmf_routing.route_model.class%</argument>
1818
<call method="setManagerName"><argument>%cmf_routing.dynamic.persistence.phpcr.manager_name%</argument></call>
1919
<call method="setPrefix"><argument>%cmf_routing.dynamic.persistence.phpcr.route_basepath%</argument></call>
2020
</service>
2121

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

27-
<service id="cmf_routing.phpcrodm_route_idprefix_listener" class="%cmf_routing.phpcrodm_route_idprefix_listener_class%">
27+
<service id="cmf_routing.phpcrodm_route_idprefix_listener" class="%cmf_routing.phpcrodm_route_idprefix_listener.class%">
2828
<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

33-
<service id="cmf_routing.phpcrodm_route_locale_listener" class="%cmf_routing.phpcrodm_route_locale_listener_class%">
33+
<service id="cmf_routing.phpcrodm_route_locale_listener" class="%cmf_routing.phpcrodm_route_locale_listener.class%">
3434
<argument>%cmf_routing.dynamic.persistence.phpcr.route_basepath%</argument>
3535
<argument>%cmf_routing.dynamic.locales%</argument>
3636
<tag name="doctrine_phpcr.event_listener" event="postLoad" />

‎Resources/config/routing-chain.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

77
<parameters>
8-
<parameter key="cmf_routing.chain_router_class">Symfony\Cmf\Component\Routing\ChainRouter</parameter>
8+
<parameter key="cmf_routing.chain_router.class">Symfony\Cmf\Component\Routing\ChainRouter</parameter>
99
</parameters>
1010

1111
<services>
12-
<service id="cmf_routing.router" class="%cmf_routing.chain_router_class%">
12+
<service id="cmf_routing.router" class="%cmf_routing.chain_router.class%">
1313
<argument type="service" id="logger" on-invalid="ignore" />
1414
<call method="setContext">
1515
<argument type="service" id="router.request_context" />

0 commit comments

Comments
 (0)