Merge branch '3.4' into 4.0

* 3.4:
  Adding yarn install text
  Reduce ambiguity of encore installation
  Fixed some typos
  Fix upgrading to Flex
  Correction in the console command folder
  Fixed some typos
  Add example usage of the link script
  fixing bad class
  Rewriting logic for accessing services from the console

Author: xabbuh

console.rst

@@ -161,33 +161,35 @@ Getting Services from the Service Container
 -------------------------------------------
 
 To actually create a new user, the command has to access to some
-:doc:`services </service_container>`. This can be done by making the command
-extend the :class:`Symfony\\Bundle\\FrameworkBundle\\Command\\ContainerAwareCommand`
-instead::
+:doc:`services </service_container>`. Since your command is already registered
+as a service, you can use normal dependency injection. Imagine you have a
+``AppBundle\Service\UserManager`` service that you want to access::
 
     // ...
-    use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+    use Symfony\Component\Console\Command\Command;
+    use AppBundle\Service\UserManager;
 
-    class CreateUserCommand extends ContainerAwareCommand
+    class CreateUserCommand extends Command
     {
+        private $userManager;
+
+        public function __construct(UserManager $userManager)
+        {
+            $this->userManager = $userManager;
+        }
+
         // ...
 
         protected function execute(InputInterface $input, OutputInterface $output)
         {
             // ...
 
-            // access the container using getContainer()
-            $userManager = $this->getContainer()->get('app.user_manager');
-            $userManager->create($input->getArgument('username'));
+            $this->userManager->create($input->getArgument('username'));
 
             $output->writeln('User successfully generated!');
         }
     }
 
-Now, once you have created the required services and logic, the command will execute
-the ``create()`` method of the ``app.user_manager`` service and the user will
-be created.
-
 Command Lifecycle
 -----------------
 

contributing/code/patches.rst

@@ -157,6 +157,22 @@ Then create a new branch off the ``2.7`` branch to work on the bugfix:
 The above checkout commands automatically switch the code to the newly created
 branch (check the branch you are working on with ``git branch``).
 
+Use your Branch in an Existing Project
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you want to test your code in an existing project that uses ``symfony/symfony``
+or Symfony components, you can use the ``link`` utility provided in the Git repository
+you cloned previously.
+This tool scans the ``vendor/`` directory of your project, finds Symfony packages it
+uses, and replaces them by symbolic links to the ones in the Git repository.
+
+.. code-block:: terminal
+
+    $ php link /path/to/your/project
+
+Before running the ``link`` command, be sure that the dependencies of the project you
+want to debug are installed by running ``composer install`` inside it.
+
 Work on your Patch
 ~~~~~~~~~~~~~~~~~~
 

frontend/encore/installation.rst

@@ -11,16 +11,23 @@ Then, install Encore into your project with Yarn:
 
 .. note::
 
-    If you want to use `npm`_ instead of `yarn`_, replace ``yarn add xxx --dev`` by
-    ``npm install xxx --save-dev``.
+    If you want to use `npm`_ instead of `yarn`_:
+
+    .. code-block:: terminal
+
+        $ npm install @symfony/webpack-encore --save-dev
 
 .. tip::
 
-    If you are using Flex for your project, you can install Encore via:
+    If you are using Flex for your project, you can initialize your project for Encore via:
 
     .. code-block:: terminal
 
         $ composer require encore
+        $ yarn install
+
+    This will create a ``webpack.config.js`` file, add the ``assets/`` directory, and add ``node_modules/`` to
+    ``.gitignore``.
 
 This command creates (or modifies) a ``package.json`` file and downloads dependencies
 into a ``node_modules/`` directory. When using Yarn, a file called ``yarn.lock``

security/voters.rst

@@ -183,7 +183,7 @@ To recap, here's what's expected from the two abstract methods:
     object). Your job is to determine if your voter should vote on the attribute/subject
     combination. If you return true, ``voteOnAttribute()`` will be called. Otherwise,
     your voter is done: some other voter should process this. In this example, you
-    return ``true`` if the attribue is ``view`` or ``edit`` and if the object is
+    return ``true`` if the attribute is ``view`` or ``edit`` and if the object is
     a ``Post`` instance.
 
 ``voteOnAttribute($attribute, $subject, TokenInterface $token)``

setup/flex.rst

@@ -169,7 +169,7 @@ manual steps:
    new project (don't copy the ``symfony/symfony`` dependency, but add the
    relevant components you are effectively using in your project).
 
-#. Install the dependencies in the new project executing ``composer install``.
+#. Install the dependencies in the new project executing ``composer update``.
    This will make Symfony Flex generate all the configuration files in
    ``config/packages/``
 

templating/embedding_controllers.rst

@@ -98,4 +98,4 @@ string syntax for controllers (i.e. **controllerPath**::**action**):
             ) ?>
         </div>
 
-The result of an embedded controler can also be :doc:`cached </http_cache/esi>`
+The result of an embedded controller can also be :doc:`cached </http_cache/esi>`