bug #47528 [Form] fix UUID tranformer (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 33382c288129 · 2022-09-09T11:28:56.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Form] fix UUID tranformer | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 4760265 [Form] fix UUID tranformer
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/UuidToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/UuidToStringTransformer.php
@@ -64,12 +64,14 @@ public function reverseTransform($value)
             throw new TransformationFailedException('Expected a string.');
         }
 
+        if (!Uuid::isValid($value)) {
+            throw new TransformationFailedException(sprintf('The value "%s" is not a valid UUID.', $value));
+        }
+
         try {
-            $uuid = new Uuid($value);
+            return Uuid::fromString($value);
         } catch (\InvalidArgumentException $e) {
             throw new TransformationFailedException(sprintf('The value "%s" is not a valid UUID.', $value), $e->getCode(), $e);
         }
-
-        return $uuid;
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/UuidToStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/UuidToStringTransformerTest.php
@@ -15,26 +15,15 @@
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Extension\Core\DataTransformer\UuidToStringTransformer;
 use Symfony\Component\Uid\Uuid;
+use Symfony\Component\Uid\UuidV1;
 
 class UuidToStringTransformerTest extends TestCase
 {
-    public function provideValidUuid()
-    {
-        return [
-            ['123e4567-e89b-12d3-a456-426655440000', new Uuid('123e4567-e89b-12d3-a456-426655440000')],
-        ];
-    }
-
-    /**
-     * @dataProvider provideValidUuid
-     */
-    public function testTransform($output, $input)
+    public function testTransform()
     {
         $transformer = new UuidToStringTransformer();
 
-        $input = new Uuid($input);
-
-        $this->assertEquals($output, $transformer->transform($input));
+        $this->assertEquals('123e4567-e89b-12d3-a456-426655440000', $transformer->transform(new UuidV1('123e4567-e89b-12d3-a456-426655440000')));
     }
 
     public function testTransformEmpty()
@@ -53,16 +42,11 @@ public function testTransformExpectsUuid()
         $transformer->transform('1234');
     }
 
-    /**
-     * @dataProvider provideValidUuid
-     */
-    public function testReverseTransform($input, $output)
+    public function testReverseTransform()
     {
-        $reverseTransformer = new UuidToStringTransformer();
-
-        $output = new Uuid($output);
+        $transformer = new UuidToStringTransformer();
 
-        $this->assertEquals($output, $reverseTransformer->reverseTransform($input));
+        $this->assertEquals(new UuidV1('123e4567-e89b-12d3-a456-426655440000'), $transformer->reverseTransform('123e4567-e89b-12d3-a456-426655440000'));
     }
 
     public function testReverseTransformEmpty()
@@ -78,7 +62,7 @@ public function testReverseTransformExpectsString()
 
         $this->expectException(TransformationFailedException::class);
 
-        $reverseTransformer->reverseTransform(1234);
+        $reverseTransformer->reverseTransform(Uuid::fromString('123e4567-e89b-12d3-a456-426655440000')->toBase32());
     }
 
     public function testReverseTransformExpectsValidUuidString()

Original file line number	Diff line number	Diff line change
`@@ -64,12 +64,14 @@ public function reverseTransform($value)`
`64`	`64`	`throw new TransformationFailedException('Expected a string.');`
`65`	`65`	`}`
`66`	`66`
	`67`	`+ if (!Uuid::isValid($value)) {`
	`68`	`+ throw new TransformationFailedException(sprintf('The value "%s" is not a valid UUID.', $value));`
	`69`	`+ }`
	`70`	`+`
`67`	`71`	`try {`
`68`		`- $uuid = new Uuid($value);`
	`72`	`+ return Uuid::fromString($value);`
`69`	`73`	`} catch (\InvalidArgumentException $e) {`
`70`	`74`	`throw new TransformationFailedException(sprintf('The value "%s" is not a valid UUID.', $value), $e->getCode(), $e);`
`71`	`75`	`}`
`72`		`-`
`73`		`- return $uuid;`
`74`	`76`	`}`
`75`	`77`	`}`