Skip to content

Commit effd9bd

Browse files
committed
Merge branch '7.1' into 7.2
* 7.1: Add missing argument [Mesenger] Mention that some option doesn't have docs
2 parents 7619e74 + ebd7193 commit effd9bd

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

messenger.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1522,7 +1522,7 @@ The transport has a number of options:
15221522
(no description available)
15231523

15241524
``sasl_method``
1525-
1525+
(no description available)
15261526

15271527
``connection_name``
15281528
For custom connection names (requires at least version 1.10 of the PHP AMQP

serializer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1803,7 +1803,7 @@ property. This can be used instead of
18031803
},
18041804
],
18051805
];
1806-
$jsonContent = $serializer->serialize($person, 'json');
1806+
$jsonContent = $serializer->serialize($person, 'json', $context);
18071807
// $jsonContent contains {"name":"cordoval","age":34,"createdAt":"2014-03-22T09:43:12-0500"}
18081808

18091809
Advanced Deserialization

0 commit comments

Comments
 (0)