Merge remote-tracking branch 'origin/master' into di-3.3-changes

* origin/master: (36 commits)
  Use the short Yaml syntax for service definition
  [#7613] remove reference to AsseticBundle
  minor #7613 Twig Extensions Reference minor brush-up (mpdude)
  Fix service locator declaration
  Minor reword
  Update Title in controller.rst
  Update scheme.rst
  Update requirements.rst
  [3.3] Document FQCN named controllers
  Document FQCN named controllers
  Use the short tag syntax
  [#7845] minor tweaks
  Update translation_domain.rst.inc
  Update page_creation.rst to correct hidden colon
  Update forms.rst
  Rewords
  Fixed the form types of the buttons in the Form reference
  [#7832] use bin/console for Symfony 3.x
  Minor reword
  Update deployment.rst
  ...

Author: weaverryan

best_practices/security.rst

@@ -339,8 +339,7 @@ To enable the security voter in the application, define a new service:
             class:      AppBundle\Security\PostVoter
             arguments: ['@security.access.decision_manager']
             public:     false
-            tags:
-               - { name: security.voter }
+            tags: [security.voter]
 
 Now, you can use the voter with the ``@Security`` annotation:
 

best_practices/templates.rst

@@ -158,8 +158,7 @@ name is irrelevant because you never use it in your own code):
             class:     AppBundle\Twig\AppExtension
             arguments: ['@app.markdown']
             public:    false
-            tags:
-                - { name: twig.extension }
+            tags: [twig.extension]
 
 .. _`Twig`: http://twig.sensiolabs.org/
 .. _`Parsedown`: http://parsedown.org/

components/cache/cache_pools.rst

@@ -9,6 +9,8 @@
     single: PDO Cache, Doctrine DBAL Cache
     single: Redis Cache
 
+.. _component-cache-cache-pools:
+
 Cache Pools and Supported Adapters
 ==================================
 

components/phpunit_bridge.rst

@@ -208,7 +208,7 @@ If you have this kind of time-related tests::
 
 You used the :doc:`Symfony Stopwatch Component </components/stopwatch>` to
 calculate the duration time of your process, here 10 seconds. However, depending
-on the load of the server your the processes running on your local machine, the
+on the load of the server or the processes running on your local machine, the
 ``$duration`` could for example be `10.000023s` instead of `10s`.
 
 This kind of tests are called transient tests: they are failing randomly
@@ -390,7 +390,7 @@ Modified PHPUnit script
 -----------------------
 
 .. versionadded:: 3.2
-    The modified PHPUnit script script was introduced in the 3.2 version of 
+    This modified PHPUnit script was introduced in the 3.2 version of 
     this component.
 
 This bridge provides a modified version of PHPUnit that you can call by using
@@ -423,8 +423,8 @@ If you have installed the bridge through Composer, you can run it by calling e.g
 
 .. tip::
 
-    Set the ``SYMFONY_PHPUNIT_REMOVE`` env var to ``symfony/yaml`` if you need
-    ``prophecy`` but not ``symfony/yaml``.
+    If you still need to use ``prophecy`` (but not ``symfony/yaml``), 
+    then set the ``SYMFONY_PHPUNIT_REMOVE`` env var to ``symfony/yaml``.
 
 .. _PHPUnit: https://phpunit.de
 .. _`PHPUnit event listener`: https://phpunit.de/manual/current/en/extending-phpunit.html#extending-phpunit.PHPUnit_Framework_TestListener

console.rst

@@ -273,7 +273,7 @@ you can extend your test from
     {
         public function testExecute()
         {
-            $kernel = $this->createKernel();
+            $kernel = static::createKernel();
             $kernel->boot();
 
             $application = new Application($kernel);

console/commands_as_services.rst

@@ -29,8 +29,7 @@ with ``console.command``:
         services:
             app.command.my_command:
                 class: AppBundle\Command\MyCommand
-                tags:
-                    - { name: console.command }
+                tags: [console.command]
 
     .. code-block:: xml
 
@@ -89,7 +88,7 @@ store the default value in some ``%command.default_name%`` parameter::
         public function __construct($defaultName)
         {
             $this->defaultName = $defaultName;
-            
+
             parent::__construct();
         }
 
@@ -135,8 +134,7 @@ inject the ``command.default_name`` parameter:
             app.command.my_command:
                 class: AppBundle\Command\MyCommand
                 arguments: ["%command.default_name%"]
-                tags:
-                    - { name: console.command }
+                tags: [console.command]
 
     .. code-block:: xml
 

contributing/code/tests.rst

@@ -55,6 +55,6 @@ what's going on and if the tests are broken because of the new code.
     to see colored test results.
 
 .. _Cmder: http://cmder.net/
-.. _ConEmu: https://code.google.com/p/conemu-maximus5/
+.. _ConEmu: https://conemu.github.io/
 .. _ANSICON: https://github.com/adoxa/ansicon/releases
 .. _Mintty: https://mintty.github.io/

controller.rst

@@ -236,6 +236,7 @@ The Symfony templating system and Twig are explained more in the
    single: Controller; Accessing services
 
 .. _controller-accessing-services:
+.. _accessing-other-services:
 
 Fetching Services as Arguments
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

controller/service.rst

@@ -66,36 +66,36 @@ Then you can define it as a service as follows:
 
         # app/config/services.yml
         services:
-            app.hello_controller:
-                class: AppBundle\Controller\HelloController
+            AppBundle\Controller\HelloController: ~
 
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
         <services>
-            <service id="app.hello_controller" class="AppBundle\Controller\HelloController" />
+            <service id="AppBundle\Controller\HelloController" />
         </services>
 
     .. code-block:: php
 
         // app/config/services.php
         use AppBundle\Controller\HelloController;
 
-        $container->register('app.hello_controller', HelloController::class);
+        $container->register(HelloController::class);
 
 Referring to the Service
 ------------------------
 
-To refer to a controller that's defined as a service, use the single colon (:)
-notation. For example, to forward to the ``indexAction()`` method of the service
-defined above with the id ``app.hello_controller``::
+If the service id is the fully-qualified class name (FQCN) of your controller,
+you can keep using the usual notation. For example, to forward to the
+``indexAction()`` method of the above ``AppBundle\Controller\HelloController``
+service::
 
-    $this->forward('app.hello_controller:indexAction', array('name' => $name));
+    $this->forward('AppBundle:Hello:index', array('name' => $name));
 
-.. note::
+Otherwise, use the single colon (``:``) notation. For example, to forward to the
+``indexAction()`` method of a service with the id ``app.hello_controller``::
 
-    You cannot drop the ``Action`` part of the method name when using this
-    syntax.
+    $this->forward('app.hello_controller:indexAction', array('name' => $name));
 
 You can also route to the service by using the same notation when defining
 the route ``_controller`` value:
@@ -123,17 +123,24 @@ the route ``_controller`` value:
             '_controller' => 'app.hello_controller:indexAction',
         )));
 
+.. note::
+
+    You cannot drop the ``Action`` part of the method name when using the
+    single colon notation.
+
 .. tip::
 
     You can also use annotations to configure routing using a controller
     defined as a service. Make sure you specify the service ID in the
-    ``@Route`` annotation. See the `FrameworkExtraBundle documentation`_ for
-    details.
+    ``@Route`` annotation if your service ID is not your controller
+    fully-qualified class name (FQCN). See the
+    `FrameworkExtraBundle documentation`_ for details.
 
 .. tip::
 
     If your controller implements the ``__invoke()`` method, you can simply
-    refer to the service id (``app.hello_controller``).
+    refer to the service id (``AppBundle\Controller\HelloController`` or
+    ``app.hello_controller`` for example).
 
 Alternatives to base Controller Methods
 ---------------------------------------
@@ -209,15 +216,14 @@ argument:
 
         # app/config/services.yml
         services:
-            app.hello_controller:
-                class:     AppBundle\Controller\HelloController
+            AppBundle\Controller\HelloController:
                 arguments: ['@templating']
 
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
         <services>
-            <service id="app.hello_controller" class="AppBundle\Controller\HelloController">
+            <service id="AppBundle\Controller\HelloController">
                 <argument type="service" id="templating"/>
             </service>
         </services>
@@ -226,13 +232,10 @@ argument:
 
         // app/config/services.php
         use AppBundle\Controller\HelloController;
-        use Symfony\Component\DependencyInjection\Definition;
         use Symfony\Component\DependencyInjection\Reference;
 
-        $container->setDefinition('app.hello_controller', new Definition(
-            HelloController::class,
-            array(new Reference('templating'))
-        ));
+        $container->register(HelloController::class)
+            ->addArgument(new Reference('templating'));
 
 Rather than fetching the ``templating`` service from the container, you can
 inject *only* the exact service(s) that you need directly into the controller.

deployment.rst

@@ -80,7 +80,7 @@ specifically tailored to the requirements of Symfony.
 `Capistrano`_ with `Symfony plugin`_
     `Capistrano`_ is a remote server automation and deployment tool written in Ruby.
     `Symfony plugin`_ is a plugin to ease Symfony related tasks, inspired by `Capifony`_
-    (which works only with Capistrano 2 )
+    (which works only with Capistrano 2).
 
 `sf2debpkg`_
     Helps you build a native Debian package for your Symfony project.
@@ -182,12 +182,12 @@ setup:
 * Pushing assets to a CDN
 * ...
 
-Application Lifecycle: Continuous Integration, QA, etc
-------------------------------------------------------
+Application Lifecycle: Continuous Integration, QA, etc.
+-------------------------------------------------------
 
 While this entry covers the technical details of deploying, the full lifecycle
-of taking code from development up to production may have a lot more steps
-(think deploying to staging, QA (Quality Assurance), running tests, etc).
+of taking code from development up to production may have more steps:
+deploying to staging, QA (Quality Assurance), running tests, etc.
 
 The use of staging, testing, QA, continuous integration, database migrations
 and the capability to roll back in case of failure are all strongly advised. There

form/create_custom_field_type.rst

@@ -309,8 +309,7 @@ the ``genders`` parameter value as the first argument to its to-be-created
                 class: AppBundle\Form\Type\GenderType
                 arguments:
                     - '%genders%'
-                tags:
-                    - { name: form.type }
+                tags: [form.type]
 
     .. code-block:: xml
 

form/data_transformers.rst

@@ -300,8 +300,7 @@ Define the form type as a service in your configuration files.
             app.form.type.task:
                 class: AppBundle\Form\Type\TaskType
                 arguments: ["@doctrine.orm.entity_manager"]
-                tags:
-                    - { name: form.type }
+                tags: [form.type]
 
     .. code-block:: xml
 
@@ -434,8 +433,7 @@ it's recognized as a custom field type:
             app.type.issue_selector:
                 class: AppBundle\Form\IssueSelectorType
                 arguments: ['@doctrine.orm.entity_manager']
-                tags:
-                    - { name: form.type }
+                tags: [form.type]
 
 
     .. code-block:: xml

form/dynamic_form_modification.rst

@@ -344,8 +344,7 @@ you need to register it as a service and tag it with :ref:`form.type <dic-tags-f
             app.form.friend_message:
                 class: AppBundle\Form\Type\FriendMessageFormType
                 arguments: ['@security.token_storage']
-                tags:
-                    - { name: form.type }
+                tags: [form.type]
 
     .. code-block:: xml
 

form/form_dependencies.rst

@@ -75,7 +75,7 @@ Suppose you need to access the ``doctrine.orm.entity_manager`` service so that y
 can make a query. First, add this as an argument to your form class::
 
     // src/AppBundle/Form/TaskType.php
-    
+
     use Doctrine\ORM\EntityManager;
     // ...
 
@@ -102,8 +102,7 @@ Next, register this as a service and tag it with ``form.type``:
             app.form.type.task:
                 class: AppBundle\Form\TaskType
                 arguments: ['@doctrine.orm.entity_manager']
-                tags:
-                    - { name: form.type }
+                tags: [form.type]
 
     .. code-block:: xml
 

form/type_guesser.rst

@@ -188,8 +188,7 @@ creating a service and tagging it as ``form.type_guesser``:
 
             app.phpdoc_type_guesser:
                 class: AppBundle\Form\TypeGuesser\PHPDocTypeGuesser
-                tags:
-                    - { name: form.type_guesser }
+                tags: [form.type_guesser]
 
     .. code-block:: xml
 

forms.rst

@@ -61,7 +61,7 @@ to do with Symfony or any other library. It's quite simply a normal PHP object
 that directly solves a problem inside *your* application (i.e. the need to
 represent a task in your application). Of course, by the end of this article,
 you'll be able to submit data to a ``Task`` instance (via an HTML form), validate
-its data, and persist it to the database.
+its data and persist it to the database.
 
 .. index::
    single: Forms; Create a form in a controller
@@ -114,7 +114,7 @@ from inside a controller::
 
 Creating a form requires relatively little code because Symfony form objects
 are built with a "form builder". The form builder's purpose is to allow you
-to write simple form "recipes", and have it do all the heavy-lifting of actually
+to write simple form "recipes" and have it do all the heavy-lifting of actually
 building the form.
 
 In this example, you've added two fields to your form - ``task`` and ``dueDate`` -
@@ -259,7 +259,7 @@ your controller::
     is called. Otherwise, changes done in the ``*_SUBMIT`` events aren't applied to the
     view (like validation errors).
 
-This controller follows a common pattern for handling forms, and has three
+This controller follows a common pattern for handling forms and has three
 possible paths:
 
 #. When initially loading the page in a browser, the form is created and

introduction/from_flat_php_to_symfony2.rst

@@ -370,7 +370,7 @@ on the requested URI::
         echo '<html><body><h1>Page Not Found</h1></body></html>';
     }
 
-For organization, both controllers (formerly ``index.php`` and ``show.php``)
+For organization, both controllers (formerly ``/index.php`` and ``/index.php/show``)
 are now PHP functions and each has been moved into a separate file named ``controllers.php``::
 
     // controllers.php

page_creation.rst

@@ -84,7 +84,7 @@ to creating a page?
    in its own section, including how to make *variable* URLs;
 
 #. *Create a controller*: The method below the route - ``numberAction()`` - is called
-   the *controller*: this is a function where *you* build the page and ultimately
+   the *controller*. This is a function where *you* build the page and ultimately
    return a ``Response`` object. You'll learn more about :doc:`controllers </controller>`
    in their own section, including how to return JSON responses.
 

profiler/data_collector.rst

@@ -94,8 +94,7 @@ To enable a data collector, define it as a regular service and tag it as
             app.request_collector:
                 class: AppBundle\DataCollector\RequestCollector
                 public: false
-                tags:
-                    - { name: data_collector }
+                tags: [data_collector]
 
     .. code-block:: xml