Merge branch '7.0' into 7.1

javiereguiluz · javiereguiluz · commit 995076b13a4c · 2024-06-28T16:44:29.000+02:00
* 7.0:
  -
  Update serializer.rst
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -264,7 +264,7 @@ Assume you have the following plain-old-PHP object::
         }
     }
 
-The definition of serialization can be specified using annotations, XML
+The definition of serialization can be specified using annotations, attributes, XML
 or YAML. The :class:`Symfony\\Component\\Serializer\\Mapping\\Factory\\ClassMetadataFactory`
 that will be used by the normalizer must be aware of the format to use.
 

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ Assume you have the following plain-old-PHP object::`
`264`	`264`	`}`
`265`	`265`	`}`
`266`	`266`
`267`		`-The definition of serialization can be specified using annotations, XML`
	`267`	`+The definition of serialization can be specified using annotations, attributes, XML`
`268`	`268`	or YAML. The :class:`Symfony\\Component\\Serializer\\Mapping\\Factory\\ClassMetadataFactory`
`269`	`269`	`that will be used by the normalizer must be aware of the format to use.`
`270`	`270`