Rework more controllers

best_practices/security.rst

@@ -328,18 +328,9 @@ the same ``getAuthorEmail()`` logic you used above:
         }
     }
 
-To enable the security voter in the application, define a new service:
-
-.. code-block:: yaml
-
-    # app/config/services.yml
-    services:
-        # ...
-        app.post_voter:
-            class:      AppBundle\Security\PostVoter
-            arguments: ['@security.access.decision_manager']
-            public:     false
-            tags: [security.voter]
+Your application will :ref:`autoconfigure <services-autoconfigure>` your security
+voter and inject a ``AccessDecisionManagerInterface`` instance in it thanks to
+:doc:`autowiring </service_container/autowiring>`.
 
 Now, you can use the voter with the ``@Security`` annotation:
 

form/form_dependencies.rst

@@ -8,9 +8,9 @@ configuration from inside of your form class. To do this, you have 2 options:
 ----------------------------
 
 The simplest way to pass services or configuration to your form is via form *options*.
-Suppose you need to access the ``doctrine.orm.entity_manager`` service so that you
-can make a query. First, allow (in fact, require) a new ``entity_manager`` option
-to be passed to your form::
+Suppose you need to access the Doctrine entity manager so that you can make a
+query. First, allow (in fact, require) a new ``entity_manager`` option to be
+passed to your form::
 
     // src/AppBundle/Form/TaskType.php
     // ...
@@ -32,13 +32,17 @@ create your form::
 
     // src/AppBundle/Controller/DefaultController.php
     use AppBundle\Form\TaskType;
+    use Doctrine\ORM\EntityManagerInterface;
 
     // ...
-    public function newAction()
+    public function newAction(EntityManagerInterface $em)
     {
+        // or fetch the em via the container
+        // $em = $this->get('doctrine')->getManager();
+
         $task = ...;
         $form = $this->createForm(TaskType::class, $task, array(
-            'entity_manager' => $this->get('doctrine.orm.entity_manager')
+            'entity_manager' => $em,
         ));
 
         // ...