Skip to content

Commit ebd7193

Browse files
committed
Merge branch '6.4' into 7.1
* 6.4: Add missing argument [Mesenger] Mention that some option doesn't have docs
2 parents 161f849 + b89995c commit ebd7193

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
@@ -1453,7 +1453,7 @@ The transport has a number of options:
14531453
(no description available)
14541454

14551455
``sasl_method``
1456-
1456+
(no description available)
14571457

14581458
``connection_name``
14591459
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)