Merge branch '2.3' into 2.7

Author: wouterj

book/http_cache.rst

@@ -651,6 +651,7 @@ header value::
     namespace AppBundle\Controller;
 
     // ...
+    use Symfony\Component\HttpFoundation\Response;
     use Symfony\Component\HttpFoundation\Request;
     use AppBundle\Entity\Article;
 
@@ -665,6 +666,7 @@ header value::
 
             $date = $authorDate > $articleDate ? $authorDate : $articleDate;
 
+            $response = new Response();
             $response->setLastModified($date);
             // Set response as public. Otherwise it will be private by default.
             $response->setPublic();

components/config/definition.rst

@@ -404,6 +404,47 @@ tree with ``append()``::
 This is also useful to help you avoid repeating yourself if you have sections
 of the config that are repeated in different places.
 
+The example results in the following:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        database:
+            connection:
+                driver:               ~ # Required
+                host:                 localhost
+                username:             ~
+                password:             ~
+                memory:               false
+                parameters:           # Required
+
+                    # Prototype
+                    name:
+                        value:                ~ # Required
+
+    .. code-block:: xml
+
+        <database>
+            <!-- driver: Required -->
+            <connection
+                driver=""
+                host="localhost"
+                username=""
+                password=""
+                memory="false"
+            >
+
+                <!-- prototype -->
+                <!-- value: Required -->
+                <parameters
+                    name="parameters name"
+                    value=""
+                />
+
+            </connection>
+        </database>
+
 .. _component-config-normalization:
 
 Normalization

components/form/introduction.rst

@@ -189,10 +189,10 @@ to bootstrap or access Twig and add the :class:`Symfony\\Bridge\\Twig\\Extension
     $defaultFormTheme = 'form_div_layout.html.twig';
 
     $vendorDir = realpath(__DIR__.'/../vendor');
-    // the path to TwigBridge so Twig can locate the
+    // the path to TwigBridge library so Twig can locate the
     // form_div_layout.html.twig file
-    $vendorTwigBridgeDir =
-        $vendorDir.'/symfony/twig-bridge/Symfony/Bridge/Twig';
+    $appVariableReflection = new \ReflectionClass('\Symfony\Bridge\Twig\AppVariable');
+    $vendorTwigBridgeDir = dirname($appVariableReflection->getFileName());
     // the path to your other templates
     $viewsDir = realpath(__DIR__.'/../views');
 

components/security/secure_tools.rst

@@ -21,11 +21,6 @@ algorithm; you can use the same strategy in your own code thanks to the
     // is some known string (e.g. password) equal to some user input?
     $bool = StringUtils::equals($knownString, $userInput);
 
-.. caution::
-
-    To avoid timing attacks, the known string must be the first argument
-    and the user-entered string the second.
-
 Generating a Secure random Number
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

contributing/community/reviews.rst

@@ -173,7 +173,8 @@ Pick a pull request from the `PRs in need of review`_ and follow these steps:
        $ git fetch origin pull/15723/head:pr15723
        $ git checkout pr15723
 
-   Now you can test the project against the code in the PR.
+   Now you can :doc:`test the project </contributing/code/tests>` against
+   the code in the PR.
 
 #. **Update the PR Status**
 

cookbook/controller/upload_file.rst

@@ -122,7 +122,7 @@ Finally, you need to update the code of the controller that handles the form::
             if ($form->isValid()) {
                 // $file stores the uploaded PDF file
                 /** @var Symfony\Component\HttpFoundation\File\UploadedFile $file */
-                $file = $product->getBrochure()
+                $file = $product->getBrochure();
 
                 // Generate a unique name for the file before saving it
                 $fileName = md5(uniqid()).'.'.$file->guessExtension();
@@ -135,13 +135,13 @@ Finally, you need to update the code of the controller that handles the form::
                 // instead of its contents
                 $product->setBrochure($filename);
 
-                // persist the $product variable or any other work...
+                // ... persist the $product variable or any other work
 
                 return $this->redirect($this->generateUrl('app_product_list'));
             }
 
             return $this->render('product/new.html.twig', array(
-                'form' => $form->createView()
+                'form' => $form->createView(),
             ));
         }
     }
@@ -150,10 +150,10 @@ There are some important things to consider in the code of the above controller:
 
 #. When the form is uploaded, the ``brochure`` property contains the whole PDF
    file contents. Since this property stores just the file name, you must set
-   its new value before persisting the changes of the entity.
+   its new value before persisting the changes of the entity;
 #. In Symfony applications, uploaded files are objects of the
    :class:`Symfony\\Component\\HttpFoundation\\File\\UploadedFile` class, which
-   provides methods for the most common operations when dealing with uploaded files.
+   provides methods for the most common operations when dealing with uploaded files;
 #. A well-known security best practice is to never trust the input provided by
    users. This also applies to the files uploaded by your visitors. The ``Uploaded``
    class provides methods to get the original file extension
@@ -163,7 +163,7 @@ There are some important things to consider in the code of the above controller:
    However, they are considered *not safe* because a malicious user could tamper
    that information. That's why it's always better to generate a unique name and
    use the :method:`Symfony\\Component\\HttpFoundation\\File\\UploadedFile::guessExtension`
-   method to let Symfony guess the right extension according to the file MIME type.
+   method to let Symfony guess the right extension according to the file MIME type;
 #. The ``UploadedFile`` class also provides a :method:`Symfony\\Component\\HttpFoundation\\File\\UploadedFile::move`
    method to store the file in its intended directory. Defining this directory
    path as an application configuration option is considered a good practice that

cookbook/form/data_transformers.rst

@@ -161,17 +161,17 @@ to and from the issue number and the ``Issue`` object::
     namespace AppBundle\Form\DataTransformer;
 
     use AppBundle\Entity\Issue;
-    use Doctrine\Common\Persistence\EntityManager;
+    use Doctrine\Common\Persistence\ObjectManager;
     use Symfony\Component\Form\DataTransformerInterface;
     use Symfony\Component\Form\Exception\TransformationFailedException;
 
     class IssueToNumberTransformer implements DataTransformerInterface
     {
-        private $entityManager;
+        private $manager;
 
-        public function __construct(EntityManager $entityManager)
+        public function __construct(ObjectManager $manager)
         {
-            $this->entityManager = $entityManager;
+            $this->manager = $manager;
         }
 
         /**
@@ -203,7 +203,7 @@ to and from the issue number and the ``Issue`` object::
                 return;
             }
 
-            $issue = $this->entityManager
+            $issue = $this->manager
                 ->getRepository('AppBundle:Issue')
                 // query for the issue with this id
                 ->find($issueNumber)
@@ -253,16 +253,16 @@ to be passed in. Then, you can easily create and add the transformer::
     namespace AppBundle\Form\Type;
 
     use AppBundle\Form\DataTransformer\IssueToNumberTransformer;
-    use Doctrine\Common\Persistence\EntityManager;
+    use Doctrine\Common\Persistence\ObjectManager;
 
     // ...
     class TaskType extends AbstractType
     {
-        private $entityManager;
+        private $manager;
 
-        public function __construct(EntityManager $entityManager)
+        public function __construct(ObjectManager $manager)
         {
-            $this->entityManager = $entityManager;
+            $this->manager = $manager;
         }
 
         public function buildForm(FormBuilderInterface $builder, array $options)
@@ -277,7 +277,7 @@ to be passed in. Then, you can easily create and add the transformer::
             // ...
 
             $builder->get('issue')
-                ->addModelTransformer(new IssueToNumberTransformer($this->entityManager));
+                ->addModelTransformer(new IssueToNumberTransformer($this->manager));
         }
 
         // ...
@@ -286,8 +286,8 @@ to be passed in. Then, you can easily create and add the transformer::
 Now, when you create your ``TaskType``, you'll need to pass in the entity manager::
 
     // e.g. in a controller somewhere
-    $entityManager = $this->getDoctrine()->getManager();
-    $form = $this->createForm(new TaskType($entityManager), $task);
+    $manager = $this->getDoctrine()->getManager();
+    $form = $this->createForm(new TaskType($manager), $task);
 
     // ...
 
@@ -331,23 +331,23 @@ First, create the custom field type class::
     namespace AppBundle\Form;
 
     use AppBundle\Form\DataTransformer\IssueToNumberTransformer;
-    use Doctrine\ORM\EntityManager;
+    use Doctrine\Common\Persistence\ObjectManager;
     use Symfony\Component\Form\AbstractType;
     use Symfony\Component\Form\FormBuilderInterface;
     use Symfony\Component\OptionsResolver\OptionsResolver;
 
     class IssueSelectorType extends AbstractType
     {
-        private $entityManager;
+        private $manager;
 
-        public function __construct(EntityManager $entityManager)
+        public function __construct(ObjectManager $manager)
         {
-            $this->entityManager = $entityManager;
+            $this->manager = $manager;
         }
 
         public function buildForm(FormBuilderInterface $builder, array $options)
         {
-            $transformer = new IssueToNumberTransformer($this->entityManager);
+            $transformer = new IssueToNumberTransformer($this->manager);
             $builder->addModelTransformer($transformer);
         }
 

cookbook/logging/monolog.rst

@@ -342,7 +342,7 @@ using a processor.
             monolog.formatter.session_request:
                 class: Monolog\Formatter\LineFormatter
                 arguments:
-                    - "[%%datetime%%] [%%extra.token%%] %%channel%%.%%level_name%%: %%message%%\n"
+                    - "[%%datetime%%] [%%extra.token%%] %%channel%%.%%level_name%%: %%message%% %%context%% %%extra%%\n"
 
             monolog.processor.session_request:
                 class: Acme\MyBundle\SessionRequestProcessor
@@ -374,7 +374,7 @@ using a processor.
                 <service id="monolog.formatter.session_request"
                     class="Monolog\Formatter\LineFormatter">
 
-                    <argument>[%%datetime%%] [%%extra.token%%] %%channel%%.%%level_name%%: %%message%%&#xA;</argument>
+                    <argument>[%%datetime%%] [%%extra.token%%] %%channel%%.%%level_name%%: %%message%% %%context%% %%extra%%&#xA;</argument>
                 </service>
 
                 <service id="monolog.processor.session_request"
@@ -404,7 +404,7 @@ using a processor.
                 'monolog.formatter.session_request',
                 'Monolog\Formatter\LineFormatter'
             )
-            ->addArgument('[%%datetime%%] [%%extra.token%%] %%channel%%.%%level_name%%: %%message%%\n');
+            ->addArgument('[%%datetime%%] [%%extra.token%%] %%channel%%.%%level_name%%: %%message%% %%context%% %%extra%%\n');
 
         $container
             ->register(