Merge branch '2.7' into 2.8

Author: wouterj

bundles/configuration.rst

@@ -88,7 +88,7 @@ bundle configuration would look like:
                 http://symfony.com/schema/dic/services/services-1.0.xsd">
 
            <acme-social:config>
-               <twitter client-id="123" client-secret="your_secret" />
+               <acme-social:twitter client-id="123" client-secret="your_secret" />
            </acme-social:config>
 
            <!-- ... -->

components/console/helpers/formatterhelper.rst

@@ -4,7 +4,7 @@
 Formatter Helper
 ================
 
-The Formatter helpers provides functions to format the output with colors.
+The Formatter helper provides functions to format the output with colors.
 You can do more advanced things with this helper than you can in
 :doc:`/console/coloring`.
 

components/event_dispatcher.rst

@@ -182,7 +182,7 @@ the ``Event`` object as the single argument::
         }
     }
 
-The ``$event`` argument is the event class that was passed when dispatching the
+The ``$event`` argument is the event object that was passed when dispatching the
 event. In many cases, a special event subclass is passed with extra
 information. You can check the documentation or implementation of each event to
 determine which instance is passed.

components/phpunit_bridge.rst

@@ -39,7 +39,7 @@ You can install the component in 2 different ways:
 Usage
 -----
 
-Once the component installed, it automatically registers a
+Once the component is installed, it automatically registers a
 `PHPUnit event listener`_ which in turn registers a `PHP error handler`_
 called :class:`Symfony\\Bridge\\PhpUnit\\DeprecationErrorHandler`. After
 running your PHPUnit tests, you will get a report similar to this one:

components/security/authentication.rst

@@ -140,7 +140,7 @@ password was valid::
         )
     );
 
-    // for some extra checks: is account enabled, locked, expired, etc.?
+    // for some extra checks: is account enabled, locked, expired, etc.
     $userChecker = new UserChecker();
 
     // an array of password encoders (see below)

configuration/environments.rst

@@ -235,7 +235,7 @@ behavior:
     # 'test' environment and debug disabled
     $ php app/console command_name --env=test --no-debug
 
-In addition to the ``--env`` and ``--debug`` options, the behavior of Symfony
+In addition to the ``--env`` and ``--no-debug`` options, the behavior of Symfony
 commands can also be controlled with environment variables. The Symfony console
 application checks the existence and value of these environment variables before
 executing any command:

event_dispatcher/before_after_filters.rst

@@ -101,7 +101,7 @@ Creating an Event Listener
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Next, you'll need to create an event listener, which will hold the logic
-that you want executed before your controllers. If you're not familiar with
+that you want to be executed before your controllers. If you're not familiar with
 event listeners, you can learn more about them at :doc:`/event_dispatcher`::
 
     // src/AppBundle/EventListener/TokenListener.php

form/dynamic_form_modification.rst

@@ -303,7 +303,7 @@ and fill in the listener logic::
 
                     $formOptions = array(
                         'class'         => User::class,
-                        'property'      => 'fullName',
+                        'choice_label'  => 'fullName',
                         'query_builder' => function (EntityRepository $er) use ($user) {
                             // build a custom query
                             // return $er->createQueryBuilder('u')->addOrderBy('fullName', 'DESC');