Skip to content

Commit 67754ca

Browse files
committed
Merge branch '6.4' into 7.1
* 6.4: adding missing 'private' just nullable
2 parents 474ef6f + 8e60054 commit 67754ca

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

components/serializer.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1486,7 +1486,7 @@ having unique identifiers::
14861486

14871487
$encoder = new JsonEncoder();
14881488
$defaultContext = [
1489-
AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => function (object $object, string $format, array $context): string {
1489+
AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => function (object $object, ?string $format, array $context): string {
14901490
return $object->getName();
14911491
},
14921492
];

security.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -2556,7 +2556,7 @@ want to include extra details only for users that have a ``ROLE_SALES_ADMIN`` ro
25562556
class SalesReportManager
25572557
{
25582558
+ public function __construct(
2559-
+ Security $security,
2559+
+ private Security $security,
25602560
+ ) {
25612561
+ }
25622562

0 commit comments

Comments
 (0)