Update Email Mask Priority (#36)

Author: annacia

src/Support/Uri.php

@@ -20,6 +20,7 @@ public static function sanitize(string $uri, array $uriMask = []): string
             array_merge(
                 array_keys($uriMask),
                 [
+                    '/\/(?<=\/)[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}(?=\/|$)/i',
                     '/\/(?<=\/)[ED]\d{8}\d{12}[0-9a-zA-Z]{11}(?=\/)?/',
                     '/\/(?<=\/)[a-f0-9]{40}(?=\/)?/i',
                     '/\/(?<=\/)([A-F0-9]{8}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{12})(?=\/)?/i',
@@ -28,13 +29,13 @@ public static function sanitize(string $uri, array $uriMask = []): string
                     '/\/(?<=\/)\d+(?=\/)?/',
                     '/\/(?<=\/)\+?\d{10,15}(?=\/|$)/',
                     '/\/(?<=\/)R[RN]\d{16}[A-Za-z0-9]{11}/',
-                    '/\/(?<=\/)[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}(?=\/|$)/i',
                     '/\/([A-Z]{3,}(?:-[A-Z]{3,})*)-([A-Z0-9]{3}-\d+(?:_\d{3})?|[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}|[A-Za-z0-9]{8,})(?=\/|$)/i',
                 ],
             ),
             array_merge(
                 array_values($uriMask),
                 [
+                    '/<EMAIL>',
                     '/<E2E-ID>',
                     '/<SHA1>',
                     '/<UUID>',
@@ -43,7 +44,6 @@ public static function sanitize(string $uri, array $uriMask = []): string
                     '/<NUMBER>',
                     '/<PHONE-NUMBER>',
                     '/<EXTERNAL-ID>',
-                    '/<EMAIL>',
                     '/<PREFIXED-ID>',
                 ],
             ),

tests/Cases/UriTest.php

@@ -181,15 +181,18 @@ public function testSanitizeEmail(): void
     {
         $email = '[email protected]';
         $email2 = '[email protected]';
+        $emailNumber = '[email protected]';
+        $emailLicensePlate = '[email protected]';
 
         self::assertSame('/v1/test', Uri::sanitize('/v1/test'));
-        self::assertSame('/v2/test/<EMAIL>', Uri::sanitize("/v2/test/{$email}"));
-        self::assertSame('/v3/test/<EMAIL>/bar', Uri::sanitize("/v3/test/{$email}/bar"));
-        self::assertSame('/v4/test/<EMAIL>/bar/<EMAIL>/', Uri::sanitize("/v4/test/{$email}/bar/{$email2}/"));
+        self::assertSame('/v2/test/<EMAIL>', Uri::sanitize("/v2/test/$email"));
+        self::assertSame('/v3/test/<EMAIL>/bar', Uri::sanitize("/v3/test/$email/bar"));
+        self::assertSame('/v4/test/<EMAIL>/bar/<EMAIL>/', Uri::sanitize("/v4/test/$email/bar/$email2/"));
         self::assertSame('/v5/test/<EMAIL>/<EMAIL>', Uri::sanitize("/v5/test/$email/$email2"));
         self::assertSame('/v6/test/<EMAIL>/<EMAIL>/', Uri::sanitize("/v6/test/$email/$email2/"));
         self::assertSame('/v7/test/<EMAIL>/<EMAIL>/<EMAIL>', Uri::sanitize("/v7/test/$email/$email2/$email"));
         self::assertSame('/v8/test/<EMAIL>/<EMAIL>/<EMAIL>/', Uri::sanitize("/v8/test/$email/$email2/$email/"));
+        self::assertSame('/v9/test/<EMAIL>/<EMAIL>/', Uri::sanitize("/v9/test/$emailNumber/$emailLicensePlate/"));
     }
 
     public function testClearUriPrefixedId(): void