Merge branch '2.7' into 2.8

Author: wouterj

.gitignore

@@ -1,3 +1,2 @@
 /_build
-/_exts
 *.pyc

best_practices/forms.rst

@@ -85,7 +85,7 @@ makes them easier to re-use later.
 
     Add buttons in the templates, not in the form classes or the controllers.
 
-Since Symfony 2.5, you can add buttons as fields on your form. This is a nice
+Since Symfony 2.3, you can add buttons as fields on your form. This is a nice
 way to simplify the template that renders your form. But if you add the buttons
 directly in your form class, this would effectively limit the scope of that form:
 

book/doctrine.rst

@@ -766,8 +766,10 @@ covered later), group, etc. For more information, see the official
 Querying for Objects Using Doctrine's Query Builder
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Instead of writing a DQL string, you can alternatively use a helpful object called
-the ``QueryBuilder`` to build that string for you::
+Instead of writing a DQL string, you can use a helpful object called the
+``QueryBuilder`` to build that string for you. This is useful when the actual query
+depends on dynamic conditions, as your code soon becomes hard to read with
+DQL as you start to concatenate strings::
 
     $repository = $this->getDoctrine()
         ->getRepository('AppBundle:Product');

book/page_creation.rst

@@ -181,7 +181,7 @@ at the end:
             }
 
             // ...
-        }        
+        }
 
     .. code-block:: yaml
 
@@ -272,7 +272,7 @@ easy, powerful and actually quite fun.
 So far, ``LuckyController`` doesn't extend any base class. The easiest way
 to use Twig - or many other tools in Symfony - is to extend Symfony's base
 :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller` class::
-    
+
     // src/AppBundle/Controller/LuckyController.php
     // ...
 
@@ -566,9 +566,9 @@ Ok, time to finish mastering the fundamentals by reading these chapters:
 * :doc:`/book/routing`
 * :doc:`/book/templating`
 
-Then, learn about Symfony's :doc:`service container </book/service_container>`
+Then, in the :doc:`Symfony Book </book/index>`, learn about the :doc:`service container </book/service_container>`,
 the :doc:`form system </book/forms>`, using :doc:`Doctrine </book/doctrine>`
-if you need to query a database and more. in the :doc:`Symfony Book </book/index>`.
+(if you need to query a database) and more!
 
 There's also a :doc:`Cookbook </cookbook/index>` *packed* with more advanced
 "how to" articles to solve *a lot* of problems.

book/templating.rst

@@ -1191,7 +1191,7 @@ is a :class:`Symfony\\Bundle\\FrameworkBundle\\Templating\\GlobalVariables`
 instance which will give you access to some application specific variables
 automatically:
 
-``app.security``
+``app.security`` (deprecated as of 2.6)
     The security context.
 ``app.user``
     The current user object.

book/testing.rst

@@ -196,9 +196,10 @@ expression or a CSS selector, then use the client to click on it. For example::
     $link = $crawler
         ->filter('a:contains("Greet")') // find all links with the text "Greet"
         ->eq(1) // select the second link in the list
-        ->link() // and click it
+        ->link()
     ;
-
+    
+    // and click it
     $crawler = $client->click($link);
 
 Submitting a form is very similar: select a form button, optionally override

components/config/definition.rst

@@ -295,7 +295,7 @@ All options can be documented using the
 method.
 
 The info will be printed as a comment when dumping the configuration tree
-with the ``config:dump`` command.
+with the ``config:dump-reference`` command.
 
 .. versionadded:: 2.6
     Since Symfony 2.6, the info will also be added to the exception message

cookbook/form/dynamic_form_modification.rst

@@ -395,7 +395,7 @@ it with :ref:`dic-tags-form-type`.
         <!-- app/config/config.xml -->
         <services>
             <service id="app.form.friend_message" class="AppBundle\Form\Type\FriendMessageFormType">
-                <argument type="service" id="security.context" />
+                <argument type="service" id="security.token_storage" />
                 <tag name="form.type" alias="friend_message" />
             </service>
         </services>

cookbook/logging/channels_handlers.rst

@@ -15,7 +15,7 @@ the channel).
 .. note::
 
     Each channel corresponds to a logger service (``monolog.logger.XXX``)
-    in the container (use the ``container:debug`` command to see a full list)
+    in the container (use the ``debug:container`` command to see a full list)
     and those are injected into different services.
 
 .. _logging-channel-handler:

reference/constraints/All.rst

@@ -25,8 +25,8 @@ entry in that array:
 
     .. code-block:: php-annotations
 
-        // src/Acme/UserBundle/Entity/User.php
-        namespace Acme\UserBundle\Entity;
+        // src/AppBundle/Entity/User.php
+        namespace AppBundle\Entity;
 
         use Symfony\Component\Validator\Constraints as Assert;
 
@@ -43,8 +43,8 @@ entry in that array:
 
     .. code-block:: yaml
 
-        # src/Acme/UserBundle/Resources/config/validation.yml
-        Acme\UserBundle\Entity\User:
+        # src/AppBundle/Resources/config/validation.yml
+        AppBundle\Entity\User:
             properties:
                 favoriteColors:
                     - All:
@@ -54,13 +54,13 @@ entry in that array:
 
     .. code-block:: xml
 
-        <!-- src/Acme/UserBundle/Resources/config/validation.xml -->
+        <!-- src/AppBundle/Resources/config/validation.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
 
-            <class name="Acme\UserBundle\Entity\User">
+            <class name="AppBundle\Entity\User">
                 <property name="favoriteColors">
                     <constraint name="All">
                         <option name="constraints">
@@ -76,8 +76,8 @@ entry in that array:
 
     .. code-block:: php
 
-        // src/Acme/UserBundle/Entity/User.php
-        namespace Acme\UserBundle\Entity;
+        // src/AppBundle/Entity/User.php
+        namespace AppBundle\Entity;
 
         use Symfony\Component\Validator\Mapping\ClassMetadata;
         use Symfony\Component\Validator\Constraints as Assert;