Merge branch '7.4' into 8.0

* 7.4:
  Make public property requirement clearer for constraint options
  [Lock] Add support for keys serialization using the Serializer component

Author: javiereguiluz

components/lock.rst

@@ -128,6 +128,15 @@ example, the kernel will automatically release semaphores acquired by the
 store (see :ref:`lock stores <lock-stores>` for supported stores), an
 exception will be thrown when the application tries to serialize the key.
 
+Locks can be serialized using both the native PHP serialization system
+and its :phpfunction:`serialize` function, or using the Serializer
+component.
+
+.. versionadded:: 7.4
+
+    The support for serializing locks with the Serializer component was
+    introduced in Symfony 7.4.
+
 .. _lock-blocking-locks:
 
 Blocking Locks

validation/custom_constraint.rst

@@ -259,7 +259,7 @@ You can use custom validators like the ones provided by Symfony itself:
             }
         }
 
-If your constraint contains options, then they should be public properties
+If your constraint contains options, then they must be public properties
 on the custom Constraint class you created earlier. These options can be
 configured like options on core Symfony constraints.