[FrameworkBundle][Serializer] Use ::class where possible

lyrixx · lyrixx · commit 60241342c9fb · 2017-04-03T16:12:53.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1194,28 +1194,28 @@ private function registerSecurityCsrfConfiguration(array $config, ContainerBuild
      */
     private function registerSerializerConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
-        if (class_exists('Symfony\Component\Serializer\Normalizer\DataUriNormalizer')) {
+        if (class_exists(DataUriNormalizer::class)) {
             // Run after serializer.normalizer.object
             $definition = $container->register('serializer.normalizer.data_uri', DataUriNormalizer::class);
             $definition->setPublic(false);
             $definition->addTag('serializer.normalizer', array('priority' => -920));
         }
 
-        if (class_exists('Symfony\Component\Serializer\Normalizer\DateTimeNormalizer')) {
+        if (class_exists(DateTimeNormalizer::class)) {
             // Run before serializer.normalizer.object
             $definition = $container->register('serializer.normalizer.datetime', DateTimeNormalizer::class);
             $definition->setPublic(false);
             $definition->addTag('serializer.normalizer', array('priority' => -910));
         }
 
-        if (class_exists('Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer')) {
+        if (class_exists(JsonSerializableNormalizer::class)) {
             // Run before serializer.normalizer.object
             $definition = $container->register('serializer.normalizer.json_serializable', JsonSerializableNormalizer::class);
             $definition->setPublic(false);
             $definition->addTag('serializer.normalizer', array('priority' => -900));
         }
 
-        if (class_exists('Symfony\Component\Serializer\Normalizer\ConstraintViolationListNormalizer')) {
+        if (class_exists(ConstraintViolationListNormalizer::class)) {
             // Run before serializer.normalizer.object
             $definition = $container->register('serializer.normalizer.constraint_violation_list_normalizer', ConstraintViolationListNormalizer::class);
             $definition->setPublic(false);
diff --git a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
@@ -16,6 +16,8 @@
 /**
  * A normalizer that normalize a ConstraintViolationListInterface instance.
  *
+ * This Normalizer implements RFC7807 {@link https://tools.ietf.org/html/rfc7807}.
+ *
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
@@ -30,8 +32,9 @@ public function normalize($object, $format = null, array $context = array())
         $messages = array();
         foreach ($object as $violation) {
             $violations[] = array(
-                'propertyPath' => $violation->getPropertyPath(),
+                'property_path' => $violation->getPropertyPath(),
                 'message' => $violation->getMessage(),
+                'code' => $violation->getCode(),
             );
             $propertyPath = $violation->getPropertyPath();
             $prefix = $propertyPath ? sprintf('%s: ', $propertyPath) : '';
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ConstraintViolationListNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ConstraintViolationListNormalizerTest.php
@@ -38,8 +38,8 @@ public function testSupportsNormalization()
     public function testNormalize()
     {
         $list = new ConstraintViolationList(array(
-            new ConstraintViolation('a', 'b', array(), 'c', 'd', 'e'),
-            new ConstraintViolation('1', '2', array(), '3', '4', '5'),
+            new ConstraintViolation('a', 'b', array(), 'c', 'd', 'e', null, 'f'),
+            new ConstraintViolation('1', '2', array(), '3', '4', '5', null, '6'),
         ));
 
         $expected = array(
@@ -49,12 +49,14 @@ public function testNormalize()
 4: 1',
             'violations' => array(
                     array(
-                        'propertyPath' => 'd',
+                        'property_path' => 'd',
                         'message' => 'a',
+                        'code' => 'f',
                     ),
                     array(
-                        'propertyPath' => '4',
+                        'property_path' => '4',
                         'message' => '1',
+                        'code' => '6',
                     ),
                 ),
         );
