Merge branch '2.x' into 3.x

mbabker · mbabker · commit d486b7d782c8 · 2025-12-30T09:28:04.000-05:00
diff --git a/src/Serializer/Handler/MoneyHandler.php b/src/Serializer/Handler/MoneyHandler.php
@@ -85,8 +85,7 @@ public function deserializeMoneyFromXml(XmlDeserializationVisitor $visitor, \Sim
      */
     public function serializeMoneyToJson(JsonSerializationVisitor $visitor, Money $money, array $type, SerializationContext $context)
     {
-        /** @phpstan-ignore-next-line return.type */
-        return $visitor->visitArray(
+        return $visitor->visitArray( // @phpstan-ignore-line return.type
             [
                 'amount' => $money->getAmount(),
                 'currency' => $money->getCurrency()->getCode(),

Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,7 @@ public function deserializeMoneyFromXml(XmlDeserializationVisitor $visitor, \Sim`
`85`	`85`	`*/`
`86`	`86`	`public function serializeMoneyToJson(JsonSerializationVisitor $visitor, Money $money, array $type, SerializationContext $context)`
`87`	`87`	`{`
`88`		`- /** @phpstan-ignore-next-line return.type */`
`89`		`- return $visitor->visitArray(`
	`88`	`+ return $visitor->visitArray( // @phpstan-ignore-line return.type`
`90`	`89`	`[`
`91`	`90`	`'amount' => $money->getAmount(),`
`92`	`91`	`'currency' => $money->getCurrency()->getCode(),`