Update some examples using 3.3 features

GuilhemN · GuilhemN · commit 5fc9ffe477c5 · 2017-05-08T14:41:12.000+02:00
diff --git a/best_practices/templates.rst b/best_practices/templates.rst
@@ -73,21 +73,11 @@ a new dependency of the project:
 
     $ composer require erusev/parsedown
 
-Then, create a new ``Markdown`` service that will be used later by the Twig
-extension. The service definition only requires the path to the class:
-
-.. code-block:: yaml
-
-    # app/config/services.yml
-    services:
-        # ...
-        app.markdown:
-            class: AppBundle\Utils\Markdown
-
-And the ``Markdown`` class just needs to define one single method to transform
+Then, create a new ``Markdown`` class that will be used later by the Twig
+extension. It just needs to define one single method to transform
 Markdown content into HTML::
 
-    namespace AppBundle\Utils;
+    namespace AppBundle\Service;
 
     class Markdown
     {
@@ -114,7 +104,7 @@ service in the constructor of the Twig extension:
 
     namespace AppBundle\Twig;
 
-    use AppBundle\Utils\Markdown;
+    use AppBundle\Service\Markdown;
 
     class AppExtension extends \Twig_Extension
     {
@@ -147,18 +137,21 @@ service in the constructor of the Twig extension:
         }
     }
 
-Lastly define a new service to enable this Twig extension in the app (the service
-name is irrelevant because you never use it in your own code):
+Lastly make sure these new classes are registered as services:
 
 .. code-block:: yaml
 
     # app/config/services.yml
     services:
-        app.twig.app_extension:
-            class:     AppBundle\Twig\AppExtension
-            arguments: ['@app.markdown']
-            public:    false
-            tags: [twig.extension]
+        _defaults:
+            # ... be sure autowiring and autoconfiguring are enabled
+            autowire: true
+            autoconfigure: true
+        # ...
+
+        # add Service/ to the list of directories to load services from
+        AppBundle\:
+            resource: '../../src/AppBundle/{Service,Updates,Command,Form,EventSubscriber,Twig,Security}'
 
 .. _`Twig`: http://twig.sensiolabs.org/
 .. _`Parsedown`: http://parsedown.org/
diff --git a/console/commands_as_services.rst b/console/commands_as_services.rst
@@ -27,9 +27,7 @@ with ``console.command``:
 
         # app/config/config.yml
         services:
-            app.command.my_command:
-                class: AppBundle\Command\MyCommand
-                tags: [console.command]
+            AppBundle\Command\MyCommand: [console.command]
 
     .. code-block:: xml
 
@@ -41,8 +39,7 @@ with ``console.command``:
             http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="app.command.my_command"
-                    class="AppBundle\Command\MyCommand">
+                <service id="AppBundle\Command\MyCommand">
                     <tag name="console.command" />
                 </service>
             </services>
@@ -53,8 +50,7 @@ with ``console.command``:
         // app/config/config.php
         use AppBundle\Command\MyCommand;
 
-        $container
-            ->register('app.command.my_command', MyCommand::class)
+        $container->register(MyCommand::class)
             ->addTag('console.command')
         ;
 
@@ -131,8 +127,7 @@ inject the ``command.default_name`` parameter:
             command.default_name: Javier
 
         services:
-            app.command.my_command:
-                class: AppBundle\Command\MyCommand
+            AppBundle\Command\MyCommand:
                 arguments: ["%command.default_name%"]
                 tags: [console.command]
 
@@ -150,8 +145,7 @@ inject the ``command.default_name`` parameter:
             </parameters>
 
             <services>
-                <service id="app.command.my_command"
-                    class="AppBundle\Command\MyCommand">
+                <service class="AppBundle\Command\MyCommand">
                     <argument>%command.default_name%</argument>
                     <tag name="console.command" />
                 </service>
@@ -166,7 +160,7 @@ inject the ``command.default_name`` parameter:
         $container->setParameter('command.default_name', 'Javier');
 
         $container
-            ->register('app.command.my_command', MyCommand::class)
+            ->register(MyCommand::class)
             ->setArguments(array('%command.default_name%'))
             ->addTag('console.command')
         ;
diff --git a/event_dispatcher/before_after_filters.rst b/event_dispatcher/before_after_filters.rst
@@ -155,16 +155,15 @@ your listener to be called just before any controller is executed.
 
         # app/config/services.yml
         services:
-            app.tokens.action_listener:
-                class: AppBundle\EventListener\TokenListener
+            AppBundle\EventListener\TokenListener:
                 arguments: ['%tokens%']
                 tags:
                     - { name: kernel.event_listener, event: kernel.controller, method: onKernelController }
 
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
-        <service id="app.tokens.action_listener" class="AppBundle\EventListener\TokenListener">
+        <service id="AppBundle\EventListener\TokenListener">
             <argument>%tokens%</argument>
             <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController" />
         </service>
@@ -174,14 +173,14 @@ your listener to be called just before any controller is executed.
         // app/config/services.php
         use AppBundle\EventListener\TokenListener;
 
-        $container->register('app.tokens.action_listener', TokenListener::class)
+        $container->register(TokenListener::class)
             ->addArgument('%tokens%')
             ->addTag('kernel.event_listener', array(
                 'event'  => 'kernel.controller',
                 'method' => 'onKernelController',
             ));
 
-With this configuration, your ``TokenListener`` ``onKernelController()`` method
+With this configuration, the ``TokenListener::onKernelController()`` method
 will be executed on each request. If the controller that is about to be executed
 implements ``TokenAuthenticatedController``, token authentication is
 applied. This lets you have a "before" filter on any controller that you
@@ -250,8 +249,7 @@ event:
 
         # app/config/services.yml
         services:
-            app.tokens.action_listener:
-                class: AppBundle\EventListener\TokenListener
+            AppBundle\EventListener\TokenListener:
                 arguments: ['%tokens%']
                 tags:
                     - { name: kernel.event_listener, event: kernel.controller, method: onKernelController }
@@ -260,7 +258,7 @@ event:
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
-        <service id="app.tokens.action_listener" class="AppBundle\EventListener\TokenListener">
+        <service id="AppBundle\EventListener\TokenListener">
             <argument>%tokens%</argument>
             <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController" />
             <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
@@ -271,7 +269,7 @@ event:
         // app/config/services.php
         use AppBundle\EventListener\TokenListener;
 
-        $container->register('app.tokens.action_listener', TokenListener::class)
+        $container->register(TokenListener::class)
             ->addArgument('%tokens%')
             ->addTag('kernel.event_listener', array(
                 'event'  => 'kernel.controller',
diff --git a/form/create_custom_field_type.rst b/form/create_custom_field_type.rst
@@ -303,37 +303,31 @@ the ``genders`` parameter value as the first argument to its to-be-created
 
     .. code-block:: yaml
 
-        # src/AppBundle/Resources/config/services.yml
+        # app/config/services.yml
         services:
-            app.form.type.gender:
-                class: AppBundle\Form\Type\GenderType
+            AppBundle\Form\Type\GenderType:
                 arguments:
                     - '%genders%'
                 tags: [form.type]
 
     .. code-block:: xml
 
-        <!-- src/AppBundle/Resources/config/services.xml -->
-        <service id="app.form.type.gender" class="AppBundle\Form\Type\GenderType">
+        <!-- app/config/services.xml -->
+        <service id="AppBundle\Form\Type\GenderType">
             <argument>%genders%</argument>
             <tag name="form.type" />
         </service>
 
     .. code-block:: php
 
-        // src/AppBundle/Resources/config/services.php
+        // app/config/services.php
         use AppBundle\Form\Type\GenderType;
 
-        $container->register('app.form.type.gender', GenderType::class)
+        $container->register(GenderType::class)
             ->addArgument('%genders%')
             ->addTag('form.type')
         ;
 
-.. tip::
-
-    Make sure the services file is being imported. See :ref:`service-container-imports-directive`
-    for details.
-
 .. versionadded:: 3.3
     Prior to Symfony 3.3, you needed to define form type services as ``public``.
     Starting from Symfony 3.3, you can also define them as ``private``.
diff --git a/form/create_form_type_extension.rst b/form/create_form_type_extension.rst
@@ -102,16 +102,13 @@ tag:
     .. code-block:: yaml
 
         services:
-            app.image_type_extension:
-                class: AppBundle\Form\Extension\ImageTypeExtension
+            AppBundle\Form\Extension\ImageTypeExtension:
                 tags:
                     - { name: form.type_extension, extended_type: Symfony\Component\Form\Extension\Core\Type\FileType }
 
     .. code-block:: xml
 
-        <service id="app.image_type_extension"
-            class="AppBundle\Form\Extension\ImageTypeExtension"
-        >
+        <service id="AppBundle\Form\Extension\ImageTypeExtension">
             <tag name="form.type_extension" extended-type="Symfony\Component\Form\Extension\Core\Type\FileType" />
         </service>
 
@@ -121,7 +118,7 @@ tag:
         use Symfony\Component\Form\Extension\Core\Type\FileType;
 
         $container
-            ->register('app.image_type_extension', ImageTypeExtension::class)
+            ->register(ImageTypeExtension::class)
             ->addTag('form.type_extension', array(
                 'extended_type' => FileType::class
             ))
@@ -137,10 +134,10 @@ field type, you will use that as the ``extended_type``.
 
 .. tip::
 
-    There is an optional tag attribute called ``priority``, which 
-    defaults to ``0`` and controls the order in which the form  
-    type extensions are loaded (the higher the priority, the earlier 
-    an extension is loaded). This is useful when you need to guarantee 
+    There is an optional tag attribute called ``priority``, which
+    defaults to ``0`` and controls the order in which the form
+    type extensions are loaded (the higher the priority, the earlier
+    an extension is loaded). This is useful when you need to guarantee
     that one extension is loaded before or after another extension.
 
     .. versionadded:: 3.2
diff --git a/form/data_transformers.rst b/form/data_transformers.rst
@@ -297,8 +297,7 @@ Define the form type as a service in your configuration files.
 
         # src/AppBundle/Resources/config/services.yml
         services:
-            app.form.type.task:
-                class: AppBundle\Form\Type\TaskType
+            AppBundle\Form\Type\TaskType:
                 arguments: ["@doctrine.orm.entity_manager"]
                 tags: [form.type]
 
@@ -311,7 +310,7 @@ Define the form type as a service in your configuration files.
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="app.form.type.task" class="AppBundle\Form\Type\TaskType">
+                <service id="AppBundle\Form\Type\TaskType">
                     <tag name="form.type" />
                     <argument type="service" id="doctrine.orm.entity_manager"></argument>
                 </service>
@@ -322,15 +321,10 @@ Define the form type as a service in your configuration files.
 
         // src/AppBundle/Resources/config/services.php
         use AppBundle\Form\Type\TaskType;
+        use Symfony\Component\DependencyInjection\Reference;
 
-        $definition = new Definition(TaskType::class, array(
-            new Reference('doctrine.orm.entity_manager'),
-        ));
-        $container
-            ->setDefinition(
-                'app.form.type.task',
-                $definition
-            )
+        $container->register(TaskType::class)
+            ->addArgument(new Reference('doctrine.orm.entity_manager'))
             ->addTag('form.type')
         ;
 
@@ -430,8 +424,7 @@ it's recognized as a custom field type:
 
         # app/config/services.yml
         services:
-            app.type.issue_selector:
-                class: AppBundle\Form\IssueSelectorType
+            AppBundle\Form\IssueSelectorType:
                 arguments: ['@doctrine.orm.entity_manager']
                 tags: [form.type]
 
@@ -446,8 +439,7 @@ it's recognized as a custom field type:
                 http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="app.type.issue_selector"
-                    class="AppBundle\Form\IssueSelectorType">
+                <service id="AppBundle\Form\IssueSelectorType">
                     <argument type="service" id="doctrine.orm.entity_manager"/>
                     <tag name="form.type" />
                 </service>
@@ -461,7 +453,7 @@ it's recognized as a custom field type:
         use Symfony\Component\DependencyInjection\Reference;
         // ...
 
-        $container->register('app.type.issue_selector', IssueSelectorType::class)
+        $container->register(IssueSelectorType::class)
             ->addArgument(new Reference('doctrine.orm.entity_manager'))
             ->addTag('form.type');
 
diff --git a/form/dynamic_form_modification.rst b/form/dynamic_form_modification.rst
@@ -341,16 +341,15 @@ you need to register it as a service and tag it with :ref:`form.type <dic-tags-f
 
         # app/config/config.yml
         services:
-            app.form.friend_message:
-                class: AppBundle\Form\Type\FriendMessageFormType
+            AppBundle\Form\Type\FriendMessageFormType:
                 arguments: ['@security.token_storage']
                 tags: [form.type]
 
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
         <services>
-            <service id="app.form.friend_message" class="AppBundle\Form\Type\FriendMessageFormType">
+            <service id="AppBundle\Form\Type\FriendMessageFormType">
                 <argument type="service" id="security.token_storage" />
                 <tag name="form.type" />
             </service>
@@ -362,7 +361,7 @@ you need to register it as a service and tag it with :ref:`form.type <dic-tags-f
         use AppBundle\Form\Type\FriendMessageFormType;
         use Symfony\Component\DependencyInjection\Reference;
 
-        $container->register('app.form.friend_message', FriendMessageFormType::class)
+        $container->register(FriendMessageFormType::class)
             ->addArgument(new Reference('security.token_storage'))
             ->addTag('form.type');
 
diff --git a/form/form_dependencies.rst b/form/form_dependencies.rst
@@ -99,8 +99,7 @@ Next, register this as a service and tag it with ``form.type``:
 
         # src/AppBundle/Resources/config/services.yml
         services:
-            app.form.type.task:
-                class: AppBundle\Form\TaskType
+            AppBundle\Form\TaskType:
                 arguments: ['@doctrine.orm.entity_manager']
                 tags: [form.type]
 
@@ -113,7 +112,7 @@ Next, register this as a service and tag it with ``form.type``:
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="app.form.type.task" class="AppBundle\Form\TaskType">
+                <service id="AppBundle\Form\TaskType">
                     <argument type="service" id="doctrine.orm.entity_manager"/>
                     <tag name="form.type" />
                 </service>
@@ -126,7 +125,7 @@ Next, register this as a service and tag it with ``form.type``:
         use AppBundle\Form\TaskType;
         use Symfony\Component\DependencyInjection\Reference;
 
-        $container->register('app.form.type.task', TaskType::class)
+        $container->register(TaskType::class)
             ->addArgument(new Reference('doctrine.orm.entity_manager'))
             ->addTag('form.type')
         ;
diff --git a/form/type_guesser.rst b/form/type_guesser.rst
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
diff --git a/routing/custom_route_loader.rst b/routing/custom_route_loader.rst
diff --git a/service_container/alias_private.rst b/service_container/alias_private.rst
