Merge branch '2.7' into 2.8

* 2.7:
  Improve functional test workflow example
  Added documentation about authentication for multiple firewalls under the same firewall context
  Fixed URLs to APIs outside of the Symfony project

Author: javiereguiluz

components/psr7.rst

@@ -36,8 +36,8 @@ that builds objects implementing PSR-7 interfaces from HttpFoundation objects.
 It also provide a default implementation using Zend Diactoros internally.
 
 The following code snippet explain how to convert a :class:`Symfony\\Component\\HttpFoundation\\Request`
-to a Zend Diactoros :class:`Zend\\Diactoros\\ServerRequest` implementing the
-:class:`Psr\\Http\\Message\\ServerRequestInterface` interface::
+to a ``Zend\\Diactoros\\ServerRequest`` class implementing the
+``Psr\\Http\\Message\\ServerRequestInterface`` interface::
 
     use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
     use Symfony\Component\HttpFoundation\Request;
@@ -48,9 +48,9 @@ to a Zend Diactoros :class:`Zend\\Diactoros\\ServerRequest` implementing the
     $psr7Factory = new DiactorosFactory();
     $psrRequest = $psr7Factory->createRequest($symfonyRequest);
 
-And now from a :class:`Symfony\\Component\\HttpFoundation\\Response` to a Zend
-Diactoros :class:`Zend\\Diactoros\\Response` implementing the :class:`Psr\\Http\\Message\\ResponseInterface`
-interface::
+And now from a :class:`Symfony\\Component\\HttpFoundation\\Response` to a
+``Zend\\Diactoros\\Response`` class implementing the
+``Psr\\Http\\Message\\ResponseInterface`` interface::
 
     use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
     use Symfony\Component\HttpFoundation\Response;
@@ -68,8 +68,8 @@ On the other hand, the bridge provide a factory interface called
 that builds HttpFoundation objects from objects implementing PSR-7 interfaces.
 
 The next snippet explain how to convert an object implementing the
-:class:`Psr\\Http\\Message\\ServerRequestInterface`
-interface to a :class:`Symfony\\Component\\HttpFoundation\\Request` instance::
+``Psr\\Http\\Message\\ServerRequestInterface`` interface to a
+:class:`Symfony\\Component\\HttpFoundation\\Request` instance::
 
     use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
 
@@ -78,7 +78,7 @@ interface to a :class:`Symfony\\Component\\HttpFoundation\\Request` instance::
     $httpFoundationFactory = new HttpFoundationFactory();
     $symfonyRequest = $httpFoundationFactory->createRequest($psrRequest);
 
-From an object implementing the :class:`Psr\\Http\\Message\\ResponseInterface`
+From an object implementing the ``Psr\\Http\\Message\\ResponseInterface``
 to a :class:`Symfony\\Component\\HttpFoundation\\Response` instance::
 
     use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;

testing.rst

@@ -124,7 +124,6 @@ application (from the routing to the views). They are no different from unit
 tests as far as PHPUnit is concerned, but they have a very specific workflow:
 
 * Make a request;
-* Test the response;
 * Click on a link or submit a form;
 * Test the response;
 * Rinse and repeat.

testing/http_authentication.rst

@@ -113,10 +113,12 @@ needs::
         {
             $session = $this->client->getContainer()->get('session');
 
-            // the firewall context defaults to the firewall name
+            $firewallName = 'secure_area';
+            // if you don't define multiple connected firewalls, the context defaults to the firewall name
+            // See https://symfony.com/doc/current/reference/configuration/security.html#firewall-context
             $firewallContext = 'secured_area';
 
-            $token = new UsernamePasswordToken('admin', null, $firewallContext, array('ROLE_ADMIN'));
+            $token = new UsernamePasswordToken('admin', null, $firewallName, array('ROLE_ADMIN'));
             $session->set('_security_'.$firewallContext, serialize($token));
             $session->save();