Merge branch '4.1' into 4.2

javiereguiluz · javiereguiluz · commit bd21549fd642 · 2018-11-28T12:31:22.000+01:00
* 4.1: Fixed the TOC of the main Forms article Framework configuration > Cache pools > Fix FQCN Duplicate composer require in Your First Functional Test chapter [#10401] fix markup Rename UserFixture to UserFixtures Reworded the caution message
diff --git a/forms.rst b/forms.rst
@@ -711,11 +711,10 @@ Learn more
     :maxdepth: 1
     :glob:
 
-    form/*
-
-* :doc:`/controller/upload_file`
-* :doc:`/reference/forms/types`
-* :doc:`/http_cache/form_csrf_caching`
+    /form/*
+    /controller/upload_file
+    /reference/forms/types
+    /http_cache/form_csrf_caching
 
 .. _`Symfony Form component`: https://github.com/symfony/form
 .. _`DateTime`: https://php.net/manual/en/class.datetime.php
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -2090,7 +2090,7 @@ settings from the base pool as defaults.
 
 .. note::
 
-    Your service MUST implement the ``Psr\\Cache\\CacheItemPoolInterface`` interface.
+    Your service MUST implement the ``Psr\Cache\CacheItemPoolInterface`` interface.
 
 public
 """"""
diff --git a/security.rst b/security.rst
@@ -177,18 +177,18 @@ create dummy database users:
     $ php bin/console make:fixtures
 
     The class name of the fixtures to create (e.g. AppFixtures):
-    > UserFixture
+    > UserFixtures
 
 Use this service to encode the passwords:
 
 .. code-block:: diff
 
-    // src/DataFixtures/UserFixture.php
+    // src/DataFixtures/UserFixtures.php
 
     + use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
     // ...
 
-    class UserFixture extends Fixture
+    class UserFixtures extends Fixture
     {
     +     private $passwordEncoder;
 
diff --git a/testing.rst b/testing.rst
@@ -143,13 +143,6 @@ utilities used in the functional tests:
 
 Your First Functional Test
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-First, install the BrowserKit component in your project:
-
-.. code-block:: terminal
-
-    $ composer require --dev symfony/browser-kit
-
 Functional tests are PHP files that typically live in the ``tests/Controller``
 directory for your bundle. If you want to test the pages handled by your
 ``PostController`` class, start by creating a new ``PostControllerTest.php``
