Merge branch '5.4' into 6.3

* 5.4:
  Missing information about payload in callback

Author: javiereguiluz

reference/constraints/Callback.rst

@@ -271,11 +271,13 @@ callback method:
 * A closure.
 
 Concrete callbacks receive an :class:`Symfony\\Component\\Validator\\Context\\ExecutionContextInterface`
-instance as only argument.
+instance as the first argument and the :ref:`payload option <reference-constraints-payload>`
+as the second argument.
 
-Static or closure callbacks receive the validated object as the first argument
-and the :class:`Symfony\\Component\\Validator\\Context\\ExecutionContextInterface`
-instance as the second argument.
+Static or closure callbacks receive the validated object as the first argument,
+the :class:`Symfony\\Component\\Validator\\Context\\ExecutionContextInterface`
+instance as the second argument and the :ref:`payload option <reference-constraints-payload>`
+as the third argument.
 
 .. include:: /reference/constraints/_groups-option.rst.inc
 

reference/constraints/_payload-option.rst.inc

@@ -1,3 +1,5 @@
+.. _reference-constraints-payload:
+
 ``payload``
 ~~~~~~~~~~~