Skip to content

Commit bce67f4

Browse files
wouterjwouterj
committed
Fixed parameter names
1 parent 04c12b2 commit bce67f4

File tree

7 files changed

+60
-55
lines changed

7 files changed

+60
-55
lines changed

‎DependencyInjection/CmfRoutingExtension.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,17 +122,17 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
122122

123123
// if any mappings are defined, set the respective route enhancer
124124
if (!empty($config['generic_controller'])) {
125-
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer_explicit_template')));
125+
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer.explicit_template')));
126126
}
127127
if (!empty($config['controllers_by_type'])) {
128-
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer_controllers_by_type')));
128+
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer.controllers_by_type')));
129129
}
130130
if (!empty($config['controllers_by_class'])) {
131-
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer_controllers_by_class')));
131+
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer.controllers_by_class')));
132132
}
133133

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

137137
if (null === $config['generic_controller']) {
138138
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 +145,10 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
145145
$controllerForTemplates[$key] = $config['generic_controller'];
146146
}
147147

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

151-
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer_controller_for_templates_by_class')));
151+
$dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer.controller_for_templates_by_class')));
152152
}
153153
}
154154

‎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

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" />

‎Resources/config/routing-dynamic.xml

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,81 +4,86 @@
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.dynamic_router_class">Symfony\Cmf\Bundle\RoutingBundle\Routing\DynamicRouter</parameter>
8-
<parameter key="cmf_routing.route_model_class">null</parameter>
7+
<parameter key="cmf_routing.dynamic_router.class">Symfony\Cmf\Bundle\RoutingBundle\Routing\DynamicRouter</parameter>
8+
<parameter key="cmf_routing.route_model.class">null</parameter>
99
<parameter key="cmf_routing.uri_filter_regexp">null</parameter>
10-
<parameter key="cmf_routing.nested_matcher_class">Symfony\Cmf\Component\Routing\NestedMatcher\NestedMatcher</parameter>
11-
<parameter key="cmf_routing.final_matcher_class">Symfony\Cmf\Component\Routing\NestedMatcher\UrlMatcher</parameter>
12-
<parameter key="cmf_routing.url_matcher_class">Symfony\Bundle\FrameworkBundle\Routing\RedirectableUrlMatcher</parameter>
13-
<parameter key="cmf_routing.generator_class">Symfony\Cmf\Component\Routing\ContentAwareGenerator</parameter>
14-
<parameter key="cmf_routing.enhancer_route_content_class">Symfony\Cmf\Component\Routing\Enhancer\RouteContentEnhancer</parameter>
15-
<parameter key="cmf_routing.enhancer_explicit_template_class">Symfony\Cmf\Component\Routing\Enhancer\FieldPresenceEnhancer</parameter>
16-
<parameter key="cmf_routing.enhancer_controllers_by_type_class">Symfony\Cmf\Component\Routing\Enhancer\FieldMapEnhancer</parameter>
17-
<parameter key="cmf_routing.enhancer_field_by_class_class">Symfony\Cmf\Component\Routing\Enhancer\FieldByClassEnhancer</parameter>
18-
<parameter key="cmf_routing.redirect_controller_class">Symfony\Cmf\Bundle\RoutingBundle\Controller\RedirectController</parameter>
10+
<parameter key="cmf_routing.nested_matcher.class">Symfony\Cmf\Component\Routing\NestedMatcher\NestedMatcher</parameter>
11+
<parameter key="cmf_routing.final_matcher.class">Symfony\Cmf\Component\Routing\NestedMatcher\UrlMatcher</parameter>
12+
<parameter key="cmf_routing.url_matcher.class">Symfony\Bundle\FrameworkBundle\Routing\RedirectableUrlMatcher</parameter>
13+
<parameter key="cmf_routing.generator.class">Symfony\Cmf\Component\Routing\ContentAwareGenerator</parameter>
14+
<parameter key="cmf_routing.enhancer_route_content.class">Symfony\Cmf\Component\Routing\Enhancer\RouteContentEnhancer</parameter>
15+
<parameter key="cmf_routing.enhancer_explicit_template.class">Symfony\Cmf\Component\Routing\Enhancer\FieldPresenceEnhancer</parameter>
16+
<parameter key="cmf_routing.enhancer_controllers_by_type.class">Symfony\Cmf\Component\Routing\Enhancer\FieldMapEnhancer</parameter>
17+
<parameter key="cmf_routing.enhancer_field_by_class.class">Symfony\Cmf\Component\Routing\Enhancer\FieldByClassEnhancer</parameter>
18+
<parameter key="cmf_routing.redirect_controller.class">Symfony\Cmf\Bundle\RoutingBundle\Controller\RedirectController</parameter>
1919
</parameters>
2020

2121
<services>
22-
<service id="cmf_routing.enhancer_route_content" class="%cmf_routing.enhancer_route_content_class%">
22+
<service id="cmf_routing.enhancer_route_content" class="%cmf_routing.enhancer_route_content.class%">
2323
<argument>_route_object</argument>
2424
<argument>_content</argument>
2525
</service>
2626

27-
<service id="cmf_routing.enhancer_explicit_template" class="%cmf_routing.enhancer_explicit_template_class%" public="false">
27+
<service id="cmf_routing.enhancer.explicit_template" class="%cmf_routing.enhancer.explicit_template.class%" public="false">
2828
<argument>_template</argument>
2929
<argument>_controller</argument>
3030
<argument>%cmf_routing.generic_controller%</argument>
3131
</service>
32-
<service id="cmf_routing.enhancer_controllers_by_type" class="%cmf_routing.enhancer_controllers_by_type_class%" public="false">
32+
33+
<service id="cmf_routing.enhancer_controllers_by_type" class="%cmf_routing.enhancer_controllers_by_type.class%" public="false">
3334
<argument>type</argument>
3435
<argument>_controller</argument>
3536
<argument>%cmf_routing.controllers_by_type%</argument>
3637
</service>
37-
<service id="cmf_routing.enhancer_controllers_by_class" class="%cmf_routing.enhancer_field_by_class_class%" public="false">
38+
39+
<service id="cmf_routing.enhancer.controllers_by_class" class="%cmf_routing.enhancer.field_by.class.class%" public="false">
3840
<argument>_content</argument>
3941
<argument>_controller</argument>
4042
<argument>%cmf_routing.controllers_by_class%</argument>
4143
</service>
42-
<service id="cmf_routing.enhancer_controller_for_templates_by_class" class="%cmf_routing.enhancer_field_by_class_class%" public="false">
44+
45+
<service id="cmf_routing.enhancer.controller_for_templates_by_class" class="%cmf_routing.enhancer.field_by.class.class%" public="false">
4346
<argument>_content</argument>
4447
<argument>_controller</argument>
45-
<argument type="collection" />
48+
<argument>%cmf_routing.defined_templates.class%</argument>
4649
</service>
47-
<service id="cmf_routing.enhancer_templates_by_class" class="%cmf_routing.enhancer_field_by_class_class%" public="false">
50+
51+
<service id="cmf_routing.enhancer.templates_by_class" class="%cmf_routing.enhancer.field_by.class.class%" public="false">
4852
<argument>_content</argument>
4953
<argument>_template</argument>
5054
<argument>%cmf_routing.templates_by_class%</argument>
5155
</service>
5256

53-
<service id="cmf_routing.dynamic_router" class="%cmf_routing.dynamic_router_class%">
57+
<service id="cmf_routing.dynamic_router" class="%cmf_routing.dynamic_router.class%">
5458
<argument type="service" id="router.request_context"/>
5559
<argument type="service" id="cmf_routing.nested_matcher" />
5660
<argument type="service" id="cmf_routing.generator" />
5761
<argument>%cmf_routing.uri_filter_regexp%</argument>
5862
<argument type="service" id="event_dispatcher" on-invalid="ignore"/>
5963
<call method="setContainer"><argument type="service" id="service_container"/></call>
60-
<call method="addRouteEnhancer"><argument type="service" id="cmf_routing.enhancer_route_content"/></call>
64+
<call method="addRouteEnhancer"><argument type="service" id="cmf_routing.enhancer.route_content"/></call>
6165
</service>
6266

63-
<service id="cmf_routing.nested_matcher" class="%cmf_routing.nested_matcher_class%">
67+
<service id="cmf_routing.nested_matcher" class="%cmf_routing.nested_matcher.class%">
6468
<argument type="service" id="cmf_routing.route_provider" />
6569
<argument type="service" id="cmf_routing.final_matcher"/>
6670
</service>
6771

6872
<service id="cmf_routing.matcher.dummy_collection" class="Symfony\Component\Routing\RouteCollection" public="false"/>
73+
6974
<service id="cmf_routing.matcher.dummy_context" class="Symfony\Component\Routing\RequestContext" public="false"/>
7075

71-
<service id="cmf_routing.final_matcher" class="%cmf_routing.final_matcher_class%">
76+
<service id="cmf_routing.final_matcher" class="%cmf_routing.final_matcher.class%">
7277
<argument type="service" id="cmf_routing.matcher.dummy_collection"/>
7378
<argument type="service" id="cmf_routing.matcher.dummy_context"/>
7479
</service>
7580

76-
<service id="cmf_routing.generator" class="%cmf_routing.generator_class%">
81+
<service id="cmf_routing.generator" class="%cmf_routing.generator.class%">
7782
<argument type="service" id="cmf_routing.route_provider" />
7883
<argument type="service" id="logger" on-invalid="ignore" />
7984
</service>
8085

81-
<service id="cmf_routing.redirect_controller" class="%cmf_routing.redirect_controller_class%">
86+
<service id="cmf_routing.redirect_controller" class="%cmf_routing.redirect_controller.class%">
8287
<argument type="service" id="router" />
8388
</service>
8489

0 commit comments

Comments
 (0)