Merge branch '6.4' into 7.1

* 6.4: Add missing argument [Mesenger] Mention that some option doesn't have docs
symfony · Dec 9, 2024 · ebd7193 · ebd7193
2 parents 161f849 + b89995c
commit ebd7193
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/messenger.rst b/messenger.rst
@@ -1453,7 +1453,7 @@ The transport has a number of options:
     (no description available)
 
 ``sasl_method``
-
+    (no description available)
 
 ``connection_name``
     For custom connection names (requires at least version 1.10 of the PHP AMQP

diff --git a/serializer.rst b/serializer.rst
@@ -1803,7 +1803,7 @@ property. This can be used instead of
             },
         ],
     ];
-    $jsonContent = $serializer->serialize($person, 'json');
+    $jsonContent = $serializer->serialize($person, 'json', $context);
     // $jsonContent contains {"name":"cordoval","age":34,"createdAt":"2014-03-22T09:43:12-0500"}
 
 Advanced Deserialization