removed all *.class parameters

symfony · Mar 26, 2015 · 3777050 · 3777050
1 parent 8c1f174
commit 3777050
Show file tree

Hide file tree

Showing 27 changed files with 143 additions and 338 deletions.
diff --git a/Resources/config/annotations.xml b/Resources/config/annotations.xml
@@ -4,22 +4,16 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
-    <parameters>
-        <parameter key="annotations.reader.class">Doctrine\Common\Annotations\AnnotationReader</parameter>
-        <parameter key="annotations.cached_reader.class">Doctrine\Common\Annotations\CachedReader</parameter>
-        <parameter key="annotations.file_cache_reader.class">Doctrine\Common\Annotations\FileCacheReader</parameter>
-    </parameters>
-
     <services>
-        <service id="annotations.reader" class="%annotations.reader.class%" public="false" />
+        <service id="annotations.reader" class="Doctrine\Common\Annotations\AnnotationReader" public="false" />
 
-        <service id="annotations.cached_reader" class="%annotations.cached_reader.class%" public="false">
+        <service id="annotations.cached_reader" class="Doctrine\Common\Annotations\CachedReader" public="false">
             <argument type="service" id="annotations.reader" />
             <argument /><!-- Cache Implementation -->
             <argument /><!-- Debug-Flag -->
         </service>
 
-        <service id="annotations.file_cache_reader" class="%annotations.file_cache_reader.class%" public="false">
+        <service id="annotations.file_cache_reader" class="Doctrine\Common\Annotations\FileCacheReader" public="false">
             <argument type="service" id="annotations.reader" />
             <argument /><!-- Cache-Directory -->
             <argument /><!-- Debug Flag -->

diff --git a/Resources/config/collectors.xml b/Resources/config/collectors.xml
@@ -4,24 +4,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
-    <parameters>
-        <parameter key="data_collector.config.class">Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector</parameter>
-        <parameter key="data_collector.request.class">Symfony\Component\HttpKernel\DataCollector\RequestDataCollector</parameter>
-        <parameter key="data_collector.exception.class">Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector</parameter>
-        <parameter key="data_collector.events.class">Symfony\Component\HttpKernel\DataCollector\EventDataCollector</parameter>
-        <parameter key="data_collector.logger.class">Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector</parameter>
-        <parameter key="data_collector.time.class">Symfony\Component\HttpKernel\DataCollector\TimeDataCollector</parameter>
-        <parameter key="data_collector.memory.class">Symfony\Component\HttpKernel\DataCollector\MemoryDataCollector</parameter>
-        <parameter key="data_collector.router.class">Symfony\Bundle\FrameworkBundle\DataCollector\RouterDataCollector</parameter>
-    </parameters>
-
     <services>
-        <service id="data_collector.config" class="%data_collector.config.class%" public="false">
+        <service id="data_collector.config" class="Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector" public="false">
             <tag name="data_collector" template="@WebProfiler/Collector/config.html.twig" id="config" priority="255" />
             <call method="setKernel"><argument type="service" id="kernel" on-invalid="ignore" /></call>
         </service>
 
-        <service id="data_collector.request" class="%data_collector.request.class%">
+        <service id="data_collector.request" class="Symfony\Component\HttpKernel\DataCollector\RequestDataCollector">
             <tag name="kernel.event_subscriber" />
             <tag name="data_collector" template="@WebProfiler/Collector/request.html.twig" id="request" priority="255" />
         </service>
@@ -30,32 +19,32 @@
             <tag name="data_collector" template="@WebProfiler/Collector/ajax.html.twig" id="ajax" priority="255" />
         </service>
 
-        <service id="data_collector.exception" class="%data_collector.exception.class%" public="false">
+        <service id="data_collector.exception" class="Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector" public="false">
             <tag name="data_collector" template="@WebProfiler/Collector/exception.html.twig" id="exception" priority="255" />
         </service>
 
-        <service id="data_collector.events" class="%data_collector.events.class%" public="false">
+        <service id="data_collector.events" class="Symfony\Component\HttpKernel\DataCollector\EventDataCollector" public="false">
             <tag name="data_collector" template="@WebProfiler/Collector/events.html.twig" id="events" priority="255" />
             <argument type="service" id="event_dispatcher" on-invalid="ignore" />
         </service>
 
-        <service id="data_collector.logger" class="%data_collector.logger.class%" public="false">
+        <service id="data_collector.logger" class="Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector" public="false">
             <tag name="data_collector" template="@WebProfiler/Collector/logger.html.twig" id="logger" priority="255" />
             <tag name="monolog.logger" channel="profiler" />
             <argument type="service" id="logger" on-invalid="ignore" />
         </service>
 
-        <service id="data_collector.time" class="%data_collector.time.class%" public="false">
+        <service id="data_collector.time" class="Symfony\Component\HttpKernel\DataCollector\TimeDataCollector" public="false">
             <tag name="data_collector" template="@WebProfiler/Collector/time.html.twig" id="time" priority="255" />
             <argument type="service" id="kernel" on-invalid="ignore" />
             <argument type="service" id="debug.stopwatch" on-invalid="ignore" />
         </service>
 
-        <service id="data_collector.memory" class="%data_collector.memory.class%" public="false">
+        <service id="data_collector.memory" class="Symfony\Component\HttpKernel\DataCollector\MemoryDataCollector" public="false">
             <tag name="data_collector" template="@WebProfiler/Collector/memory.html.twig" id="memory" priority="255" />
         </service>
 
-        <service id="data_collector.router" class="%data_collector.router.class%" >
+        <service id="data_collector.router" class="Symfony\Bundle\FrameworkBundle\DataCollector\RouterDataCollector" >
             <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController"/>
             <tag name="data_collector" template="@WebProfiler/Collector/router.html.twig" id="router" priority="255" />
         </service>

diff --git a/Resources/config/debug.xml b/Resources/config/debug.xml
@@ -5,21 +5,19 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="debug.event_dispatcher.class">Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher</parameter>
         <parameter key="debug.container.dump">%kernel.cache_dir%/%kernel.container_class%.xml</parameter>
-        <parameter key="debug.controller_resolver.class">Symfony\Component\HttpKernel\Controller\TraceableControllerResolver</parameter>
         <parameter key="debug.error_handler.throw_at">-1</parameter>
     </parameters>
 
     <services>
-        <service id="debug.event_dispatcher" class="%debug.event_dispatcher.class%">
+        <service id="debug.event_dispatcher" class="Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher">
             <tag name="monolog.logger" channel="event" />
             <argument type="service" id="debug.event_dispatcher.parent" />
             <argument type="service" id="debug.stopwatch" />
             <argument type="service" id="logger" on-invalid="null" />
         </service>
 
-        <service id="debug.controller_resolver" class="%debug.controller_resolver.class%">
+        <service id="debug.controller_resolver" class="Symfony\Component\HttpKernel\Controller\TraceableControllerResolver">
             <argument type="service" id="controller_resolver" />
             <argument type="service" id="debug.stopwatch" />
         </service>

diff --git a/Resources/config/debug_prod.xml b/Resources/config/debug_prod.xml
@@ -5,13 +5,11 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="debug.debug_handlers_listener.class">Symfony\Component\HttpKernel\EventListener\DebugHandlersListener</parameter>
-        <parameter key="debug.stopwatch.class">Symfony\Component\Stopwatch\Stopwatch</parameter>
         <parameter key="debug.error_handler.throw_at">0</parameter>
     </parameters>
 
     <services>
-        <service id="debug.debug_handlers_listener" class="%debug.debug_handlers_listener.class%">
+        <service id="debug.debug_handlers_listener" class="Symfony\Component\HttpKernel\EventListener\DebugHandlersListener">
             <tag name="kernel.event_subscriber" />
             <tag name="monolog.logger" channel="php" />
             <argument /><!-- Exception handler -->
@@ -22,6 +20,6 @@
             <argument>null</argument><!-- %templating.helper.code.file_link_format% -->
         </service>
 
-        <service id="debug.stopwatch" class="%debug.stopwatch.class%" />
+        <service id="debug.stopwatch" class="Symfony\Component\Stopwatch\Stopwatch" />
     </services>
 </container>
diff --git a/Resources/config/esi.xml b/Resources/config/esi.xml
@@ -4,15 +4,10 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
-    <parameters>
-        <parameter key="esi.class">Symfony\Component\HttpKernel\HttpCache\Esi</parameter>
-        <parameter key="esi_listener.class">Symfony\Component\HttpKernel\EventListener\SurrogateListener</parameter>
-    </parameters>
-
     <services>
-        <service id="esi" class="%esi.class%" />
+        <service id="esi" class="Symfony\Component\HttpKernel\HttpCache\Esi" />
 
-        <service id="esi_listener" class="%esi_listener.class%">
+        <service id="esi_listener" class="Symfony\Component\HttpKernel\EventListener\SurrogateListener">
             <tag name="kernel.event_subscriber" />
             <argument type="service" id="esi" on-invalid="ignore" />
         </service>

diff --git a/Resources/config/form.xml b/Resources/config/form.xml
@@ -4,21 +4,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
-    <parameters>
-        <parameter key="form.resolved_type_factory.class">Symfony\Component\Form\ResolvedFormTypeFactory</parameter>
-        <parameter key="form.registry.class">Symfony\Component\Form\FormRegistry</parameter>
-        <parameter key="form.factory.class">Symfony\Component\Form\FormFactory</parameter>
-        <parameter key="form.extension.class">Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension</parameter>
-        <parameter key="form.type_guesser.validator.class">Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser</parameter>
-        <parameter key="form.type_extension.form.request_handler.class">Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler</parameter>
-    </parameters>
-
     <services>
         <!-- ResolvedFormTypeFactory -->
-        <service id="form.resolved_type_factory" class="%form.resolved_type_factory.class%" />
+        <service id="form.resolved_type_factory" class="Symfony\Component\Form\ResolvedFormTypeFactory" />
 
         <!-- FormRegistry -->
-        <service id="form.registry" class="%form.registry.class%">
+        <service id="form.registry" class="Symfony\Component\Form\FormRegistry">
             <argument type="collection">
                 <!--
                 We don't need to be able to add more extensions.
@@ -32,13 +23,13 @@
         </service>
 
         <!-- FormFactory -->
-        <service id="form.factory" class="%form.factory.class%">
+        <service id="form.factory" class="Symfony\Component\Form\FormFactory">
             <argument type="service" id="form.registry" />
             <argument type="service" id="form.resolved_type_factory" />
         </service>
 
         <!-- DependencyInjectionExtension -->
-        <service id="form.extension" class="%form.extension.class%" public="false">
+        <service id="form.extension" class="Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension" public="false">
             <argument type="service" id="service_container" />
             <!-- All services with tag "form.type" are inserted here by FormPass -->
             <argument type="collection" />
@@ -49,7 +40,7 @@
         </service>
 
         <!-- ValidatorTypeGuesser -->
-        <service id="form.type_guesser.validator" class="%form.type_guesser.validator.class%">
+        <service id="form.type_guesser.validator" class="Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser">
             <tag name="form.type_guesser" />
             <argument type="service" id="validator.mapping.class_metadata_factory" />
         </service>
@@ -154,7 +145,7 @@
         </service>
 
         <!-- HttpFoundationRequestHandler -->
-        <service id="form.type_extension.form.request_handler" class="%form.type_extension.form.request_handler.class%" public="false">
+        <service id="form.type_extension.form.request_handler" class="Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler" public="false">
             <argument type="service" id="form.server_params" />
         </service>
 

diff --git a/Resources/config/form_debug.xml b/Resources/config/form_debug.xml
@@ -4,31 +4,24 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
-    <parameters>
-        <parameter key="form.resolved_type_factory.data_collector_proxy.class">Symfony\Component\Form\Extension\DataCollector\Proxy\ResolvedTypeFactoryDataCollectorProxy</parameter>
-        <parameter key="form.type_extension.form.data_collector.class">Symfony\Component\Form\Extension\DataCollector\Type\DataCollectorTypeExtension</parameter>
-        <parameter key="data_collector.form.class">Symfony\Component\Form\Extension\DataCollector\FormDataCollector</parameter>
-        <parameter key="data_collector.form.extractor.class">Symfony\Component\Form\Extension\DataCollector\FormDataExtractor</parameter>
-    </parameters>
-
     <services>
-        <service id="form.resolved_type_factory" class="%form.resolved_type_factory.data_collector_proxy.class%">
+        <service id="form.resolved_type_factory" class="Symfony\Component\Form\Extension\DataCollector\Proxy\ResolvedTypeFactoryDataCollectorProxy">
             <argument type="service">
-                <service class="%form.resolved_type_factory.class%" />
+                <service class="Symfony\Component\Form\ResolvedFormTypeFactory" />
             </argument>
             <argument type="service" id="data_collector.form" />
         </service>
 
         <!-- DataCollectorTypeExtension -->
-        <service id="form.type_extension.form.data_collector" class="%form.type_extension.form.data_collector.class%">
+        <service id="form.type_extension.form.data_collector" class="Symfony\Component\Form\Extension\DataCollector\Type\DataCollectorTypeExtension">
             <tag name="form.type_extension" alias="form" />
             <argument type="service" id="data_collector.form" />
         </service>
 
         <!-- DataCollector -->
-        <service id="data_collector.form.extractor" class="%data_collector.form.extractor.class%" />
+        <service id="data_collector.form.extractor" class="Symfony\Component\Form\Extension\DataCollector\FormDataExtractor" />
 
-        <service id="data_collector.form" class="%data_collector.form.class%">
+        <service id="data_collector.form" class="Symfony\Component\Form\Extension\DataCollector\FormDataCollector">
             <tag name="data_collector" template="@WebProfiler/Collector/form.html.twig" id="form" priority="255" />
             <argument type="service" id="data_collector.form.extractor" />
         </service>

diff --git a/Resources/config/fragment_listener.xml b/Resources/config/fragment_listener.xml
@@ -4,12 +4,8 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
-    <parameters>
-        <parameter key="fragment.listener.class">Symfony\Component\HttpKernel\EventListener\FragmentListener</parameter>
-    </parameters>
-
     <services>
-        <service id="fragment.listener" class="%fragment.listener.class%">
+        <service id="fragment.listener" class="Symfony\Component\HttpKernel\EventListener\FragmentListener">
             <tag name="kernel.event_subscriber" />
             <argument type="service" id="uri_signer" />
             <argument>%fragment.path%</argument>

diff --git a/Resources/config/fragment_renderer.xml b/Resources/config/fragment_renderer.xml
@@ -5,36 +5,32 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="fragment.handler.class">Symfony\Component\HttpKernel\DependencyInjection\LazyLoadingFragmentHandler</parameter>
-        <parameter key="fragment.renderer.inline.class">Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer</parameter>
-        <parameter key="fragment.renderer.hinclude.class">Symfony\Component\HttpKernel\Fragment\HIncludeFragmentRenderer</parameter>
         <parameter key="fragment.renderer.hinclude.global_template"></parameter>
-        <parameter key="fragment.renderer.esi.class">Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer</parameter>
         <parameter key="fragment.path">/_fragment</parameter>
     </parameters>
 
     <services>
-        <service id="fragment.handler" class="%fragment.handler.class%">
+        <service id="fragment.handler" class="Symfony\Component\HttpKernel\DependencyInjection\LazyLoadingFragmentHandler">
             <argument type="service" id="service_container" />
             <argument>%kernel.debug%</argument>
             <argument type="service" id="request_stack" />
         </service>
 
-        <service id="fragment.renderer.inline" class="%fragment.renderer.inline.class%">
+        <service id="fragment.renderer.inline" class="Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer">
             <tag name="kernel.fragment_renderer" alias="inline" />
             <argument type="service" id="http_kernel" />
             <argument type="service" id="event_dispatcher" />
             <call method="setFragmentPath"><argument>%fragment.path%</argument></call>
         </service>
 
-        <service id="fragment.renderer.hinclude" class="%fragment.renderer.hinclude.class%">
+        <service id="fragment.renderer.hinclude" class="Symfony\Component\HttpKernel\Fragment\HIncludeFragmentRenderer">
             <argument /> <!-- templating or Twig service -->
             <argument type="service" id="uri_signer" />
             <argument>%fragment.renderer.hinclude.global_template%</argument>
             <call method="setFragmentPath"><argument>%fragment.path%</argument></call>
         </service>
 
-        <service id="fragment.renderer.esi" class="%fragment.renderer.esi.class%">
+        <service id="fragment.renderer.esi" class="Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer">
             <tag name="kernel.fragment_renderer" alias="esi" />
             <argument type="service" id="esi" on-invalid="null" />
             <argument type="service" id="fragment.renderer.inline" />