Fix last comments

dunglas · dunglas · commit 522fe715d673 · 2018-05-21T17:14:29.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
@@ -32,18 +32,24 @@ public function normalize($object, $format = null, array $context = array())
         $violations = array();
         $messages = array();
         foreach ($object as $violation) {
-            $violations[] = array(
-                'propertyPath' => $violation->getPropertyPath(),
-                'type' => sprintf('urn:uuid:%s', $violation->getCode()),
+            $propertyPath = $violation->getPropertyPath();
+
+            $violationEntry = array(
+                'propertyPath' => $propertyPath,
                 'title' => $violation->getMessage(),
             );
-            $propertyPath = $violation->getPropertyPath();
+            if (null !== $code = $violation->getCode()) {
+                $violationEntry['type'] = sprintf('urn:uuid:%s', $code);
+            }
+
+            $violations[] = $violationEntry;
+
             $prefix = $propertyPath ? sprintf('%s: ', $propertyPath) : '';
             $messages[] = $prefix.$violation->getMessage();
         }
 
         $result = array(
-            'type' => $context['type'] ?? 'https://symfony.com/validation-error',
+            'type' => $context['type'] ?? 'https://symfony.com/errors/validation',
             'title' => $context['title'] ?? 'Validation Failed',
         );
         if (isset($context['status'])) {
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ConstraintViolationListNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ConstraintViolationListNormalizerTest.php
@@ -43,20 +43,20 @@ public function testNormalize()
         ));
 
         $expected = array(
-            'type' => 'https://symfony.com/validation-error',
+            'type' => 'https://symfony.com/errors/validation',
             'title' => 'Validation Failed',
             'detail' => 'd: a
 4: 1',
             'violations' => array(
                     array(
                         'propertyPath' => 'd',
-                        'type' => 'urn:uuid:f',
                         'title' => 'a',
+                        'type' => 'urn:uuid:f',
                     ),
                     array(
                         'propertyPath' => '4',
-                        'type' => 'urn:uuid:6',
                         'title' => '1',
+                        'type' => 'urn:uuid:6',
                     ),
                 ),
         );
