Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 156c4a2

Browse files
fabpotfabpot
committed
feature #14070 removed all *.class parameters (fabpot)
This PR was merged into the 3.0-dev branch. Discussion ---------- removed all *.class parameters | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | no | Fixed tickets | #11881, #12822 | License | MIT | Doc PR | none Commits ------- 8835d1a removed all *.class parameters
2 parents 9fe9832 + 8835d1a commit 156c4a2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+251
-615
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml

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

7-
<parameters>
8-
<parameter key="annotations.reader.class">Doctrine\Common\Annotations\AnnotationReader</parameter>
9-
<parameter key="annotations.cached_reader.class">Doctrine\Common\Annotations\CachedReader</parameter>
10-
<parameter key="annotations.file_cache_reader.class">Doctrine\Common\Annotations\FileCacheReader</parameter>
11-
</parameters>
12-
137
<services>
14-
<service id="annotations.reader" class="%annotations.reader.class%" public="false" />
8+
<service id="annotations.reader" class="Doctrine\Common\Annotations\AnnotationReader" public="false" />
159

16-
<service id="annotations.cached_reader" class="%annotations.cached_reader.class%" public="false">
10+
<service id="annotations.cached_reader" class="Doctrine\Common\Annotations\CachedReader" public="false">
1711
<argument type="service" id="annotations.reader" />
1812
<argument /><!-- Cache Implementation -->
1913
<argument /><!-- Debug-Flag -->
2014
</service>
2115

22-
<service id="annotations.file_cache_reader" class="%annotations.file_cache_reader.class%" public="false">
16+
<service id="annotations.file_cache_reader" class="Doctrine\Common\Annotations\FileCacheReader" public="false">
2317
<argument type="service" id="annotations.reader" />
2418
<argument /><!-- Cache-Directory -->
2519
<argument /><!-- Debug Flag -->

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml

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

7-
<parameters>
8-
<parameter key="data_collector.config.class">Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector</parameter>
9-
<parameter key="data_collector.request.class">Symfony\Component\HttpKernel\DataCollector\RequestDataCollector</parameter>
10-
<parameter key="data_collector.exception.class">Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector</parameter>
11-
<parameter key="data_collector.events.class">Symfony\Component\HttpKernel\DataCollector\EventDataCollector</parameter>
12-
<parameter key="data_collector.logger.class">Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector</parameter>
13-
<parameter key="data_collector.time.class">Symfony\Component\HttpKernel\DataCollector\TimeDataCollector</parameter>
14-
<parameter key="data_collector.memory.class">Symfony\Component\HttpKernel\DataCollector\MemoryDataCollector</parameter>
15-
<parameter key="data_collector.router.class">Symfony\Bundle\FrameworkBundle\DataCollector\RouterDataCollector</parameter>
16-
</parameters>
17-
187
<services>
19-
<service id="data_collector.config" class="%data_collector.config.class%" public="false">
8+
<service id="data_collector.config" class="Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector" public="false">
209
<tag name="data_collector" template="@WebProfiler/Collector/config.html.twig" id="config" priority="255" />
2110
<call method="setKernel"><argument type="service" id="kernel" on-invalid="ignore" /></call>
2211
</service>
2312

24-
<service id="data_collector.request" class="%data_collector.request.class%">
13+
<service id="data_collector.request" class="Symfony\Component\HttpKernel\DataCollector\RequestDataCollector">
2514
<tag name="kernel.event_subscriber" />
2615
<tag name="data_collector" template="@WebProfiler/Collector/request.html.twig" id="request" priority="255" />
2716
</service>
@@ -30,32 +19,32 @@
3019
<tag name="data_collector" template="@WebProfiler/Collector/ajax.html.twig" id="ajax" priority="255" />
3120
</service>
3221

33-
<service id="data_collector.exception" class="%data_collector.exception.class%" public="false">
22+
<service id="data_collector.exception" class="Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector" public="false">
3423
<tag name="data_collector" template="@WebProfiler/Collector/exception.html.twig" id="exception" priority="255" />
3524
</service>
3625

37-
<service id="data_collector.events" class="%data_collector.events.class%" public="false">
26+
<service id="data_collector.events" class="Symfony\Component\HttpKernel\DataCollector\EventDataCollector" public="false">
3827
<tag name="data_collector" template="@WebProfiler/Collector/events.html.twig" id="events" priority="255" />
3928
<argument type="service" id="event_dispatcher" on-invalid="ignore" />
4029
</service>
4130

42-
<service id="data_collector.logger" class="%data_collector.logger.class%" public="false">
31+
<service id="data_collector.logger" class="Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector" public="false">
4332
<tag name="data_collector" template="@WebProfiler/Collector/logger.html.twig" id="logger" priority="255" />
4433
<tag name="monolog.logger" channel="profiler" />
4534
<argument type="service" id="logger" on-invalid="ignore" />
4635
</service>
4736

48-
<service id="data_collector.time" class="%data_collector.time.class%" public="false">
37+
<service id="data_collector.time" class="Symfony\Component\HttpKernel\DataCollector\TimeDataCollector" public="false">
4938
<tag name="data_collector" template="@WebProfiler/Collector/time.html.twig" id="time" priority="255" />
5039
<argument type="service" id="kernel" on-invalid="ignore" />
5140
<argument type="service" id="debug.stopwatch" on-invalid="ignore" />
5241
</service>
5342

54-
<service id="data_collector.memory" class="%data_collector.memory.class%" public="false">
43+
<service id="data_collector.memory" class="Symfony\Component\HttpKernel\DataCollector\MemoryDataCollector" public="false">
5544
<tag name="data_collector" template="@WebProfiler/Collector/memory.html.twig" id="memory" priority="255" />
5645
</service>
5746

58-
<service id="data_collector.router" class="%data_collector.router.class%" >
47+
<service id="data_collector.router" class="Symfony\Bundle\FrameworkBundle\DataCollector\RouterDataCollector" >
5948
<tag name="kernel.event_listener" event="kernel.controller" method="onKernelController"/>
6049
<tag name="data_collector" template="@WebProfiler/Collector/router.html.twig" id="router" priority="255" />
6150
</service>

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +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="debug.event_dispatcher.class">Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher</parameter>
98
<parameter key="debug.container.dump">%kernel.cache_dir%/%kernel.container_class%.xml</parameter>
10-
<parameter key="debug.controller_resolver.class">Symfony\Component\HttpKernel\Controller\TraceableControllerResolver</parameter>
119
<parameter key="debug.error_handler.throw_at">-1</parameter>
1210
</parameters>
1311

1412
<services>
15-
<service id="debug.event_dispatcher" class="%debug.event_dispatcher.class%">
13+
<service id="debug.event_dispatcher" class="Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher">
1614
<tag name="monolog.logger" channel="event" />
1715
<argument type="service" id="debug.event_dispatcher.parent" />
1816
<argument type="service" id="debug.stopwatch" />
1917
<argument type="service" id="logger" on-invalid="null" />
2018
</service>
2119

22-
<service id="debug.controller_resolver" class="%debug.controller_resolver.class%">
20+
<service id="debug.controller_resolver" class="Symfony\Component\HttpKernel\Controller\TraceableControllerResolver">
2321
<argument type="service" id="controller_resolver" />
2422
<argument type="service" id="debug.stopwatch" />
2523
</service>

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +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="debug.debug_handlers_listener.class">Symfony\Component\HttpKernel\EventListener\DebugHandlersListener</parameter>
9-
<parameter key="debug.stopwatch.class">Symfony\Component\Stopwatch\Stopwatch</parameter>
108
<parameter key="debug.error_handler.throw_at">0</parameter>
119
</parameters>
1210

1311
<services>
14-
<service id="debug.debug_handlers_listener" class="%debug.debug_handlers_listener.class%">
12+
<service id="debug.debug_handlers_listener" class="Symfony\Component\HttpKernel\EventListener\DebugHandlersListener">
1513
<tag name="kernel.event_subscriber" />
1614
<tag name="monolog.logger" channel="php" />
1715
<argument /><!-- Exception handler -->
@@ -22,6 +20,6 @@
2220
<argument>null</argument><!-- %templating.helper.code.file_link_format% -->
2321
</service>
2422

25-
<service id="debug.stopwatch" class="%debug.stopwatch.class%" />
23+
<service id="debug.stopwatch" class="Symfony\Component\Stopwatch\Stopwatch" />
2624
</services>
2725
</container>

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml

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

7-
<parameters>
8-
<parameter key="esi.class">Symfony\Component\HttpKernel\HttpCache\Esi</parameter>
9-
<parameter key="esi_listener.class">Symfony\Component\HttpKernel\EventListener\SurrogateListener</parameter>
10-
</parameters>
11-
127
<services>
13-
<service id="esi" class="%esi.class%" />
8+
<service id="esi" class="Symfony\Component\HttpKernel\HttpCache\Esi" />
149

15-
<service id="esi_listener" class="%esi_listener.class%">
10+
<service id="esi_listener" class="Symfony\Component\HttpKernel\EventListener\SurrogateListener">
1611
<tag name="kernel.event_subscriber" />
1712
<argument type="service" id="esi" on-invalid="ignore" />
1813
</service>

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml

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

7-
<parameters>
8-
<parameter key="form.resolved_type_factory.class">Symfony\Component\Form\ResolvedFormTypeFactory</parameter>
9-
<parameter key="form.registry.class">Symfony\Component\Form\FormRegistry</parameter>
10-
<parameter key="form.factory.class">Symfony\Component\Form\FormFactory</parameter>
11-
<parameter key="form.extension.class">Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension</parameter>
12-
<parameter key="form.type_guesser.validator.class">Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser</parameter>
13-
<parameter key="form.type_extension.form.request_handler.class">Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler</parameter>
14-
</parameters>
15-
167
<services>
178
<!-- ResolvedFormTypeFactory -->
18-
<service id="form.resolved_type_factory" class="%form.resolved_type_factory.class%" />
9+
<service id="form.resolved_type_factory" class="Symfony\Component\Form\ResolvedFormTypeFactory" />
1910

2011
<!-- FormRegistry -->
21-
<service id="form.registry" class="%form.registry.class%">
12+
<service id="form.registry" class="Symfony\Component\Form\FormRegistry">
2213
<argument type="collection">
2314
<!--
2415
We don't need to be able to add more extensions.
@@ -32,13 +23,13 @@
3223
</service>
3324

3425
<!-- FormFactory -->
35-
<service id="form.factory" class="%form.factory.class%">
26+
<service id="form.factory" class="Symfony\Component\Form\FormFactory">
3627
<argument type="service" id="form.registry" />
3728
<argument type="service" id="form.resolved_type_factory" />
3829
</service>
3930

4031
<!-- DependencyInjectionExtension -->
41-
<service id="form.extension" class="%form.extension.class%" public="false">
32+
<service id="form.extension" class="Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension" public="false">
4233
<argument type="service" id="service_container" />
4334
<!-- All services with tag "form.type" are inserted here by FormPass -->
4435
<argument type="collection" />
@@ -49,7 +40,7 @@
4940
</service>
5041

5142
<!-- ValidatorTypeGuesser -->
52-
<service id="form.type_guesser.validator" class="%form.type_guesser.validator.class%">
43+
<service id="form.type_guesser.validator" class="Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser">
5344
<tag name="form.type_guesser" />
5445
<argument type="service" id="validator.mapping.class_metadata_factory" />
5546
</service>
@@ -154,7 +145,7 @@
154145
</service>
155146

156147
<!-- HttpFoundationRequestHandler -->
157-
<service id="form.type_extension.form.request_handler" class="%form.type_extension.form.request_handler.class%" public="false">
148+
<service id="form.type_extension.form.request_handler" class="Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler" public="false">
158149
<argument type="service" id="form.server_params" />
159150
</service>
160151

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/form_debug.xml

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

7-
<parameters>
8-
<parameter key="form.resolved_type_factory.data_collector_proxy.class">Symfony\Component\Form\Extension\DataCollector\Proxy\ResolvedTypeFactoryDataCollectorProxy</parameter>
9-
<parameter key="form.type_extension.form.data_collector.class">Symfony\Component\Form\Extension\DataCollector\Type\DataCollectorTypeExtension</parameter>
10-
<parameter key="data_collector.form.class">Symfony\Component\Form\Extension\DataCollector\FormDataCollector</parameter>
11-
<parameter key="data_collector.form.extractor.class">Symfony\Component\Form\Extension\DataCollector\FormDataExtractor</parameter>
12-
</parameters>
13-
147
<services>
15-
<service id="form.resolved_type_factory" class="%form.resolved_type_factory.data_collector_proxy.class%">
8+
<service id="form.resolved_type_factory" class="Symfony\Component\Form\Extension\DataCollector\Proxy\ResolvedTypeFactoryDataCollectorProxy">
169
<argument type="service">
17-
<service class="%form.resolved_type_factory.class%" />
10+
<service class="Symfony\Component\Form\ResolvedFormTypeFactory" />
1811
</argument>
1912
<argument type="service" id="data_collector.form" />
2013
</service>
2114

2215
<!-- DataCollectorTypeExtension -->
23-
<service id="form.type_extension.form.data_collector" class="%form.type_extension.form.data_collector.class%">
16+
<service id="form.type_extension.form.data_collector" class="Symfony\Component\Form\Extension\DataCollector\Type\DataCollectorTypeExtension">
2417
<tag name="form.type_extension" alias="form" />
2518
<argument type="service" id="data_collector.form" />
2619
</service>
2720

2821
<!-- DataCollector -->
29-
<service id="data_collector.form.extractor" class="%data_collector.form.extractor.class%" />
22+
<service id="data_collector.form.extractor" class="Symfony\Component\Form\Extension\DataCollector\FormDataExtractor" />
3023

31-
<service id="data_collector.form" class="%data_collector.form.class%">
24+
<service id="data_collector.form" class="Symfony\Component\Form\Extension\DataCollector\FormDataCollector">
3225
<tag name="data_collector" template="@WebProfiler/Collector/form.html.twig" id="form" priority="255" />
3326
<argument type="service" id="data_collector.form.extractor" />
3427
</service>

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_listener.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

7-
<parameters>
8-
<parameter key="fragment.listener.class">Symfony\Component\HttpKernel\EventListener\FragmentListener</parameter>
9-
</parameters>
10-
117
<services>
12-
<service id="fragment.listener" class="%fragment.listener.class%">
8+
<service id="fragment.listener" class="Symfony\Component\HttpKernel\EventListener\FragmentListener">
139
<tag name="kernel.event_subscriber" />
1410
<argument type="service" id="uri_signer" />
1511
<argument>%fragment.path%</argument>

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,32 @@
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="fragment.handler.class">Symfony\Component\HttpKernel\DependencyInjection\LazyLoadingFragmentHandler</parameter>
9-
<parameter key="fragment.renderer.inline.class">Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer</parameter>
10-
<parameter key="fragment.renderer.hinclude.class">Symfony\Component\HttpKernel\Fragment\HIncludeFragmentRenderer</parameter>
118
<parameter key="fragment.renderer.hinclude.global_template"></parameter>
12-
<parameter key="fragment.renderer.esi.class">Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer</parameter>
139
<parameter key="fragment.path">/_fragment</parameter>
1410
</parameters>
1511

1612
<services>
17-
<service id="fragment.handler" class="%fragment.handler.class%">
13+
<service id="fragment.handler" class="Symfony\Component\HttpKernel\DependencyInjection\LazyLoadingFragmentHandler">
1814
<argument type="service" id="service_container" />
1915
<argument>%kernel.debug%</argument>
2016
<argument type="service" id="request_stack" />
2117
</service>
2218

23-
<service id="fragment.renderer.inline" class="%fragment.renderer.inline.class%">
19+
<service id="fragment.renderer.inline" class="Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer">
2420
<tag name="kernel.fragment_renderer" alias="inline" />
2521
<argument type="service" id="http_kernel" />
2622
<argument type="service" id="event_dispatcher" />
2723
<call method="setFragmentPath"><argument>%fragment.path%</argument></call>
2824
</service>
2925

30-
<service id="fragment.renderer.hinclude" class="%fragment.renderer.hinclude.class%">
26+
<service id="fragment.renderer.hinclude" class="Symfony\Component\HttpKernel\Fragment\HIncludeFragmentRenderer">
3127
<argument /> <!-- templating or Twig service -->
3228
<argument type="service" id="uri_signer" />
3329
<argument>%fragment.renderer.hinclude.global_template%</argument>
3430
<call method="setFragmentPath"><argument>%fragment.path%</argument></call>
3531
</service>
3632

37-
<service id="fragment.renderer.esi" class="%fragment.renderer.esi.class%">
33+
<service id="fragment.renderer.esi" class="Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer">
3834
<tag name="kernel.fragment_renderer" alias="esi" />
3935
<argument type="service" id="esi" on-invalid="null" />
4036
<argument type="service" id="fragment.renderer.inline" />

0 commit comments

Comments
 (0)