Merge branch '2.8' into 3.4

* 2.8:
  Fix typos in psr7.rst
  reword note about empty values during validation

Author: xabbuh

components/psr7.rst

@@ -35,9 +35,9 @@ The bridge provides an interface of a factory called
 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\\ServerRequest`` class implementing the
-``Psr\\Http\\Message\\ServerRequestInterface`` interface::
+The following code snippet explains how to convert a :class:`Symfony\\Component\\HttpFoundation\\Request`
+to a ``Zend\Diactoros\ServerRequest`` class implementing the
+``Psr\Http\Message\ServerRequestInterface`` interface::
 
     use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
     use Symfony\Component\HttpFoundation\Request;
@@ -49,8 +49,8 @@ to a ``Zend\\Diactoros\\ServerRequest`` class implementing the
     $psrRequest = $psr7Factory->createRequest($symfonyRequest);
 
 And now from a :class:`Symfony\\Component\\HttpFoundation\\Response` to a
-``Zend\\Diactoros\\Response`` class implementing the
-``Psr\\Http\\Message\\ResponseInterface`` interface::
+``Zend\Diactoros\Response`` class implementing the
+``Psr\Http\Message\ResponseInterface`` interface::
 
     use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
     use Symfony\Component\HttpFoundation\Response;
@@ -68,7 +68,7 @@ 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
-``Psr\\Http\\Message\\ServerRequestInterface`` interface to a
+``Psr\Http\Message\ServerRequestInterface`` interface to a
 :class:`Symfony\\Component\\HttpFoundation\\Request` instance::
 
     use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
@@ -78,7 +78,7 @@ The next snippet explain how to convert an object implementing the
     $httpFoundationFactory = new HttpFoundationFactory();
     $symfonyRequest = $httpFoundationFactory->createRequest($psrRequest);
 
-From an object implementing the ``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;

reference/constraints/_empty-values-are-valid.rst.inc

@@ -1,7 +1,6 @@
 .. note::
 
-    As with most of the other constraints, ``null`` values and empty strings
-    are considered valid values. Otherwise, in addition to validating this value,
-    you would also be requiring it, making it impossible to be optional. That's
-    why it's common to combine this constraint with
-    :doc:`NotBlank </reference/constraints/NotBlank>`.
+    As with most of the other constraints, ``null`` and empty strings are
+    considered valid values. This is to allow them to be optional values.
+    If the value is mandatory, a common solution is to combine this constraint
+    with :doc:`NotBlank </reference/constraints/NotBlank>`.