Merge branch '7.0' into 7.1

javiereguiluz · javiereguiluz · commit bd1af2673488 · 2024-06-28T16:45:37.000+02:00
* 7.0:
  [Serializer] Remove any mention to annotations
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -264,8 +264,8 @@ Assume you have the following plain-old-PHP object::
         }
     }
 
-The definition of serialization can be specified using annotations, attributes, XML
-or YAML. The :class:`Symfony\\Component\\Serializer\\Mapping\\Factory\\ClassMetadataFactory`
+The definition of serialization can be specified using 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.
 
 The following code shows how to initialize the :class:`Symfony\\Component\\Serializer\\Mapping\\Factory\\ClassMetadataFactory`

Original file line number	Diff line number	Diff line change
`@@ -264,8 +264,8 @@ 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, attributes, XML`
`268`		-or YAML. The :class:`Symfony\\Component\\Serializer\\Mapping\\Factory\\ClassMetadataFactory`
	`267`	`+The definition of serialization can be specified using attributes, XML or YAML.`
	`268`	+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`
`271`	`271`	The following code shows how to initialize the :class:`Symfony\\Component\\Serializer\\Mapping\\Factory\\ClassMetadataFactory`