Merge branch '3.4' into 4.2

javiereguiluz · javiereguiluz · commit 901081108cee · 2019-04-04T15:06:53.000+02:00
* 3.4:
  Fixed the RST syntax of a serializer article
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -248,29 +248,27 @@ 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`
 for each format:
 
-.. configuration-block::
-
-    .. code-block:: php-annotations
+* Annotations in PHP files::
 
-        use Doctrine\Common\Annotations\AnnotationReader;
-        use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
-        use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
+    use Doctrine\Common\Annotations\AnnotationReader;
+    use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
+    use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
 
-        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
+    $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
 
-    .. code-block:: yaml
+* XML files::
 
-        use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
-        use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
+    use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
+    use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
 
-        $classMetadataFactory = new ClassMetadataFactory(new YamlFileLoader('/path/to/your/definition.yaml'));
+    $classMetadataFactory = new ClassMetadataFactory(new YamlFileLoader('/path/to/your/definition.yaml'));
 
-    .. code-block:: xml
+* YAML files::
 
-        use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
-        use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
+    use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
+    use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
 
-        $classMetadataFactory = new ClassMetadataFactory(new XmlFileLoader('/path/to/your/definition.xml'));
+    $classMetadataFactory = new ClassMetadataFactory(new XmlFileLoader('/path/to/your/definition.xml'));
 
 .. _component-serializer-attributes-groups-annotations:
 
