minor #41803 [Uid] Prevent double validation in Uuid::fromString() with base32 values (fancyweb)

nicolas-grekas · nicolas-grekas · commit 8a8d2a64a1e0 · 2021-06-23T20:28:53.000+02:00
This PR was merged into the 5.3 branch. Discussion ---------- [Uid] Prevent double validation in Uuid::fromString() with base32 values | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Follow up to #41693, it should be a little bit faster if we don't validate twice, right? Commits ------- 043ee56 [Uid] Prevent double validation in Uuid::fromString() with base32 values
diff --git a/src/Symfony/Component/Uid/Ulid.php b/src/Symfony/Component/Uid/Ulid.php
@@ -43,7 +43,7 @@ public function __construct(string $ulid = null)
             throw new \InvalidArgumentException(sprintf('Invalid ULID: "%s".', $ulid));
         }
 
-        $this->uid = strtr($ulid, 'abcdefghjkmnpqrstvwxyz', 'ABCDEFGHJKMNPQRSTVWXYZ');
+        $this->uid = strtoupper($ulid);
     }
 
     public static function isValid(string $ulid): bool
diff --git a/src/Symfony/Component/Uid/Uuid.php b/src/Symfony/Component/Uid/Uuid.php
@@ -54,7 +54,9 @@ public static function fromString(string $uuid): parent
             $uuid = substr_replace($uuid, '-', 18, 0);
             $uuid = substr_replace($uuid, '-', 23, 0);
         } elseif (26 === \strlen($uuid) && Ulid::isValid($uuid)) {
-            $uuid = (new Ulid($uuid))->toRfc4122();
+            $ulid = new Ulid('00000000000000000000000000');
+            $ulid->uid = strtoupper($uuid);
+            $uuid = $ulid->toRfc4122();
         }
 
         if (__CLASS__ !== static::class || 36 !== \strlen($uuid)) {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct(string $ulid = null)`
`43`	`43`	`throw new \InvalidArgumentException(sprintf('Invalid ULID: "%s".', $ulid));`
`44`	`44`	`}`
`45`	`45`
`46`		`- $this->uid = strtr($ulid, 'abcdefghjkmnpqrstvwxyz', 'ABCDEFGHJKMNPQRSTVWXYZ');`
	`46`	`+ $this->uid = strtoupper($ulid);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public static function isValid(string $ulid): bool`