Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit b3fd040

Browse files
wouterjwouterj
authored
Merge pull request #186 from symfony-cmf/remove-class-params
Removed all *.class parameters
2 parents 629b399 + 3b0c53d commit b3fd040

File tree

7 files changed

+27
-94
lines changed

7 files changed

+27
-94
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
Changelog
22
=========
33

4-
dev-master
5-
----------
6-
4+
* **2016-06-18**: [BC BREAK] Removed all `*.class` parameters.
75
* Convert non-managed intermediate nodes into AutoRoute documents #165
86

97
1.0.0

‎DependencyInjection/Configuration.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ public function getConfigTreeBuilder()
3636
->prototype('array')
3737
->beforeNormalization()
3838
->ifString()
39-
->then(function ($v) { return array('path' => $v); })
39+
->then(function ($v) {
40+
return array('path' => $v);
41+
})
4042
->end()
4143
->children()
4244
->scalarNode('path')->isRequired()->end()

‎Resources/config/auto_route.xml

Lines changed: 12 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,99 +3,63 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
55

6-
<parameters>
7-
8-
<parameter key="cmf_routing_auto.phpcrodm_auto_route_listener.class">Symfony\Cmf\Bundle\RoutingAutoBundle\Doctrine\Phpcr\AutoRouteListener</parameter>
9-
<parameter key="cmf_routing_auto.auto_route_manager.class">Symfony\Cmf\Component\RoutingAuto\AutoRouteManager</parameter>
10-
<parameter key="cmf_routing_auto.service_registry.class">Symfony\Cmf\Component\RoutingAuto\ServiceRegistry</parameter>
11-
<parameter key="cmf_routing_auto.uri_generator.class">Symfony\Cmf\Component\RoutingAuto\UriGenerator</parameter>
12-
<parameter key="cmf_routing_auto.uri_context_collection_builder.class">Symfony\Cmf\Component\RoutingAuto\UriContextCollectionBuilder</parameter>
13-
14-
<parameter key="cmf_routing_auto.metadata.loader.yaml.class">Symfony\Cmf\Component\RoutingAuto\Mapping\Loader\YmlFileLoader</parameter>
15-
<parameter key="cmf_routing_auto.metadata.loader.xml.class">Symfony\Cmf\Component\RoutingAuto\Mapping\Loader\XmlFileLoader</parameter>
16-
<parameter key="cmf_routing_auto.metadata.loader.delegating.class">Symfony\Component\Config\Loader\DelegatingLoader</parameter>
17-
<parameter key="cmf_routing_auto.metadata.loader.resolver.class">Symfony\Component\Config\Loader\LoaderResolver</parameter>
18-
<parameter key="cmf_routing_auto.metadata.factory.class">Symfony\Cmf\Component\RoutingAuto\Mapping\MetadataFactory</parameter>
19-
20-
<!-- to be removed when caching is implemented -->
21-
<parameter key="cmf_routing_auto.metadata.factory.builder.class">Symfony\Cmf\Component\RoutingAuto\Mapping\MetadataFactoryBuilder</parameter>
22-
23-
</parameters>
24-
256
<services>
26-
<service
27-
id="cmf_routing_auto.slugifier"
28-
class="Symfony\Cmf\Api\Slugifier\CallbackSlugifier"
29-
>
7+
<service id="cmf_routing_auto.slugifier" class="Symfony\Cmf\Api\Slugifier\CallbackSlugifier">
308
<argument>Ferrandini\Urlizer::urlize</argument>
319
</service>
3210

3311
<!-- Auto Route Manager -->
34-
<service
35-
id="cmf_routing_auto.auto_route_manager"
36-
class="Symfony\Cmf\Component\RoutingAuto\AutoRouteManager"
37-
>
12+
<service id="cmf_routing_auto.auto_route_manager" class="Symfony\Cmf\Component\RoutingAuto\AutoRouteManager">
3813
<argument type="service" id="cmf_routing_auto.adapter" />
3914
<argument type="service" id="cmf_routing_auto.uri_generator" />
4015
<argument type="service" id="cmf_routing_auto.defunct_route_handler.delegating" />
4116
<argument type="service" id="cmf_routing_auto.uri_context_collection_builder" />
4217
</service>
4318

4419
<!-- URL Generator -->
45-
<service id="cmf_routing_auto.uri_generator" class="%cmf_routing_auto.uri_generator.class%">
20+
<service id="cmf_routing_auto.uri_generator" class="Symfony\Cmf\Component\RoutingAuto\UriGenerator">
4621
<argument type="service" id="cmf_routing_auto.service_registry" />
4722
</service>
4823

49-
<service id="cmf_routing_auto.uri_context_collection_builder" class="%cmf_routing_auto.uri_context_collection_builder.class%">
24+
<service id="cmf_routing_auto.uri_context_collection_builder" class="Symfony\Cmf\Component\RoutingAuto\UriContextCollectionBuilder">
5025
<argument type="service" id="cmf_routing_auto.metadata.factory" />
5126
<argument type="service" id="cmf_routing_auto.adapter" />
5227
</service>
5328

5429
<!-- Service Registry -->
55-
<service id="cmf_routing_auto.service_registry" class="%cmf_routing_auto.service_registry.class%" />
30+
<service id="cmf_routing_auto.service_registry" class="Symfony\Cmf\Component\RoutingAuto\ServiceRegistry" />
5631

5732
<!-- Metadata -->
58-
<service id="cmf_routing_auto.metadata.loader.yaml"
59-
class="%cmf_routing_auto.metadata.loader.yaml.class%"
60-
>
33+
<service id="cmf_routing_auto.metadata.loader.yaml" class="Symfony\Cmf\Component\RoutingAuto\Mapping\Loader\YmlFileLoader">
6134
<argument type="service" id="file_locator" />
6235
</service>
6336

64-
<service id="cmf_routing_auto.metadata.loader.xml"
65-
class="%cmf_routing_auto.metadata.loader.xml.class%"
66-
>
37+
<service id="cmf_routing_auto.metadata.loader.xml" class="Symfony\Cmf\Component\RoutingAuto\Mapping\Loader\XmlFileLoader">
6738
<argument type="service" id="file_locator" />
6839
</service>
6940

70-
<service id="cmf_routing_auto.metadata.loader.resolver"
71-
class="%cmf_routing_auto.metadata.loader.resolver.class%">
41+
<service id="cmf_routing_auto.metadata.loader.resolver" class="Symfony\Component\Config\Loader\LoaderResolver">
7242
<argument type="collection">
7343
<argument type="service" id="cmf_routing_auto.metadata.loader.yaml" />
7444
<argument type="service" id="cmf_routing_auto.metadata.loader.xml" />
7545
</argument>
7646
</service>
7747

78-
<service id="cmf_routing_auto.metadata.loader.delegating"
79-
class="%cmf_routing_auto.metadata.loader.delegating.class%">
48+
<service id="cmf_routing_auto.metadata.loader.delegating" class="Symfony\Component\Config\Loader\DelegatingLoader">
8049
<argument type="service" id="cmf_routing_auto.metadata.loader.resolver" />
8150
</service>
8251

83-
<service id="cmf_routing_auto.metadata.factory.builder"
84-
class="%cmf_routing_auto.metadata.factory.builder.class%">
52+
<service id="cmf_routing_auto.metadata.factory.builder" class="Symfony\Cmf\Component\RoutingAuto\Mapping\MetadataFactoryBuilder">
8553
<argument type="service" id="cmf_routing_auto.metadata.loader.delegating" />
8654
<argument>%cmf_routing_auto.metadata.loader.resources%</argument>
8755
</service>
8856

89-
<service id="cmf_routing_auto.metadata.factory"
90-
class="%cmf_routing_auto.metadata.factory.class%">
57+
<service id="cmf_routing_auto.metadata.factory" class="Symfony\Cmf\Component\RoutingAuto\Mapping\MetadataFactory">
9158
<factory service="cmf_routing_auto.metadata.factory.builder" method="getMetadataFactory" />
9259
</service>
9360

9461
<!-- Controller -->
95-
<service
96-
id="cmf_routing_auto.redirect_controller"
97-
class="Symfony\Cmf\Bundle\RoutingAutoBundle\Controller\RedirectController"
98-
>
62+
<service id="cmf_routing_auto.redirect_controller" class="Symfony\Cmf\Bundle\RoutingAutoBundle\Controller\RedirectController">
9963
<argument type="service" id="router" />
10064
</service>
10165
</services>

‎Resources/config/conflict_resolvers.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,14 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
55

6-
<parameters>
7-
8-
<parameter key="cmf_routing_auto.conflict_resolver.auto_increment.class">Symfony\Cmf\Component\RoutingAuto\ConflictResolver\AutoIncrementConflictResolver</parameter>
9-
<parameter key="cmf_routing_auto.conflict_resolver.throw_exception.class">Symfony\Cmf\Component\RoutingAuto\ConflictResolver\ThrowExceptionConflictResolver</parameter>
10-
11-
</parameters>
12-
136
<services>
147

15-
<service id="cmf_routing_auto.conflict_resolver.auto_increment" class="%cmf_routing_auto.conflict_resolver.auto_increment.class%">
8+
<service id="cmf_routing_auto.conflict_resolver.auto_increment" class="Symfony\Cmf\Component\RoutingAuto\ConflictResolver\AutoIncrementConflictResolver">
169
<argument type="service" id="cmf_routing_auto.adapter" />
1710
<tag name="cmf_routing_auto.conflict_resolver" alias="auto_increment" />
1811
</service>
1912

20-
<service id="cmf_routing_auto.conflict_resolver.throw_exception" class="%cmf_routing_auto.conflict_resolver.throw_exception.class%">
13+
<service id="cmf_routing_auto.conflict_resolver.throw_exception" class="Symfony\Cmf\Component\RoutingAuto\ConflictResolver\ThrowExceptionConflictResolver">
2114
<tag name="cmf_routing_auto.conflict_resolver" alias="throw_exception" />
2215
</service>
2316

‎Resources/config/defunct_route_handlers.xml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,19 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
55

6-
<parameters>
7-
8-
<parameter key="cmf_routing_auto.defunct_route_handler.remove.class">Symfony\Cmf\Component\RoutingAuto\DefunctRouteHandler\RemoveDefunctRouteHandler</parameter>
9-
<parameter key="cmf_routing_auto.defunct_route_handler.leave_redirect.class">Symfony\Cmf\Component\RoutingAuto\DefunctRouteHandler\LeaveRedirectDefunctRouteHandler</parameter>
10-
<parameter key="cmf_routing_auto.defunct_route_handler.delegating.class">Symfony\Cmf\Component\RoutingAuto\DefunctRouteHandler\DelegatingDefunctRouteHandler</parameter>
11-
12-
</parameters>
13-
146
<services>
157

16-
<service id="cmf_routing_auto.defunct_route_handler.remove" class="%cmf_routing_auto.defunct_route_handler.remove.class%">
8+
<service id="cmf_routing_auto.defunct_route_handler.remove" class="Symfony\Cmf\Component\RoutingAuto\DefunctRouteHandler\RemoveDefunctRouteHandler">
179
<argument type="service" id="cmf_routing_auto.adapter" />
1810
<tag name="cmf_routing_auto.defunct_route_handler" alias="remove" />
1911
</service>
2012

21-
<service id="cmf_routing_auto.defunct_route_handler.leave_redirect" class="%cmf_routing_auto.defunct_route_handler.leave_redirect.class%">
13+
<service id="cmf_routing_auto.defunct_route_handler.leave_redirect" class="Symfony\Cmf\Component\RoutingAuto\DefunctRouteHandler\LeaveRedirectDefunctRouteHandler">
2214
<argument type="service" id="cmf_routing_auto.adapter" />
2315
<tag name="cmf_routing_auto.defunct_route_handler" alias="leave_redirect" />
2416
</service>
2517

26-
<service id="cmf_routing_auto.defunct_route_handler.delegating" class="%cmf_routing_auto.defunct_route_handler.delegating.class%">
18+
<service id="cmf_routing_auto.defunct_route_handler.delegating" class="Symfony\Cmf\Component\RoutingAuto\DefunctRouteHandler\DelegatingDefunctRouteHandler">
2719
<argument type="service" id="cmf_routing_auto.metadata.factory" />
2820
<argument type="service" id="cmf_routing_auto.adapter" />
2921
<argument type="service" id="cmf_routing_auto.service_registry" />

‎Resources/config/phpcr-odm.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,15 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
55

6-
<parameters>
7-
8-
<parameter key="cmf_routing_auto.phpcrodm_auto_route_listener.class">Symfony\Cmf\Bundle\RoutingAutoBundle\Doctrine\Phpcr\AutoRouteListener</parameter>
9-
<parameter key="cmf_routing_auto.adapter.phpcr_odm.class">Symfony\Cmf\Bundle\RoutingAutoBundle\Adapter\PhpcrOdmAdapter</parameter>
10-
11-
</parameters>
12-
136
<services>
147
<!-- Adapters -->
15-
<service id="cmf_routing_auto.adapter.phpcr_odm" class="%cmf_routing_auto.adapter.phpcr_odm.class%">
8+
<service id="cmf_routing_auto.adapter.phpcr_odm" class="Symfony\Cmf\Bundle\RoutingAutoBundle\Adapter\PhpcrOdmAdapter">
169
<argument type="service" id="doctrine_phpcr.odm.default_document_manager"/>
1710
<argument>%cmf_routing_auto.persistence.phpcr.route_basepath%</argument>
1811
<tag name="cmf_routing_auto.adapter" alias="doctrine_phpcr_odm" />
1912
</service>
2013

21-
<service id="cmf_routing_auto.phpcrodm_auto_route_listener" class="%cmf_routing_auto.phpcrodm_auto_route_listener.class%">
14+
<service id="cmf_routing_auto.phpcrodm_auto_route_listener" class="Symfony\Cmf\Bundle\RoutingAutoBundle\Doctrine\Phpcr\AutoRouteListener">
2215
<argument type="service" id="service_container"/>
2316
<tag name="doctrine_phpcr.event_listener" event="onFlush"/>
2417
<tag name="doctrine_phpcr.event_listener" event="endFlush"/>

‎Resources/config/token_providers.xml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,23 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
55

6-
<parameters>
7-
8-
<parameter key="cmf_routing_auto.token_provider.content_method.class">Symfony\Cmf\Component\RoutingAuto\TokenProvider\ContentMethodProvider</parameter>
9-
<parameter key="cmf_routing_auto.token_provider.content_datetime.class">Symfony\Cmf\Component\RoutingAuto\TokenProvider\ContentDateTimeProvider</parameter>
10-
<parameter key="cmf_routing_auto.token_provider.content_locale.class">Symfony\Cmf\Component\RoutingAuto\TokenProvider\ContentLocaleProvider</parameter>
11-
<parameter key="cmf_routing_auto.token_provider.container.class">Symfony\Cmf\Component\RoutingAuto\TokenProvider\SymfonyContainerParameterProvider</parameter>
12-
13-
</parameters>
14-
156
<services>
167

17-
<service id="cmf_routing_auto.token_provider.content_method" class="%cmf_routing_auto.token_provider.content_method.class%">
8+
<service id="cmf_routing_auto.token_provider.content_method" class="Symfony\Cmf\Component\RoutingAuto\TokenProvider\ContentMethodProvider">
189
<argument type="service" id="cmf_routing_auto.slugifier" />
1910
<tag name="cmf_routing_auto.token_provider" alias="content_method" />
2011
</service>
2112

22-
<service id="cmf_routing_auto.token_provider.content_datetime" class="%cmf_routing_auto.token_provider.content_datetime.class%">
13+
<service id="cmf_routing_auto.token_provider.content_datetime" class="Symfony\Cmf\Component\RoutingAuto\TokenProvider\ContentDateTimeProvider">
2314
<argument type="service" id="cmf_routing_auto.slugifier" />
2415
<tag name="cmf_routing_auto.token_provider" alias="content_datetime" />
2516
</service>
2617

27-
<service id="cmf_routing_auto.token_provider.content_locale" class="%cmf_routing_auto.token_provider.content_locale.class%">
18+
<service id="cmf_routing_auto.token_provider.content_locale" class="Symfony\Cmf\Component\RoutingAuto\TokenProvider\ContentLocaleProvider">
2819
<tag name="cmf_routing_auto.token_provider" alias="content_locale" />
2920
</service>
3021

31-
<service id="cmf_routing_auto.token_provider.container" class="%cmf_routing_auto.token_provider.container.class%">
22+
<service id="cmf_routing_auto.token_provider.container" class="Symfony\Cmf\Component\RoutingAuto\TokenProvider\SymfonyContainerParameterProvider">
3223
<tag name="cmf_routing_auto.token_provider" alias="container" />
3324
<argument type="service" id="service_container" />
3425
</service>

0 commit comments

Comments
 (0)