fix(symfony): ECMA-262 pattern with RegExp validator (#6733)

api-platform · Oct 25, 2024 · 5a8ef11 · 5a8ef11
1 parent cecd771
commit 5a8ef11
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/...idator/Metadata/Resource/Factory/ParameterValidationResourceMetadataCollectionFactory.php b/...idator/Metadata/Resource/Factory/ParameterValidationResourceMetadataCollectionFactory.php
@@ -130,7 +130,7 @@ private function addSchemaValidation(Parameter $parameter, ?array $schema = null
         }
 
         if (isset($schema['pattern'])) {
-            $assertions[] = new Regex($schema['pattern']);
+            $assertions[] = new Regex('#'.$schema['pattern'].'#');
         }
 
         if (isset($schema['maxLength']) || isset($schema['minLength'])) {

diff --git a/tests/Fixtures/TestBundle/ApiResource/WithParameter.php b/tests/Fixtures/TestBundle/ApiResource/WithParameter.php
@@ -62,7 +62,7 @@
         'length' => new QueryParameter(schema: ['maxLength' => 1, 'minLength' => 3]),
         'array' => new QueryParameter(schema: ['minItems' => 2, 'maxItems' => 3]),
         'multipleOf' => new QueryParameter(schema: ['multipleOf' => 2]),
-        'pattern' => new QueryParameter(schema: ['pattern' => '/\d/']),
+        'pattern' => new QueryParameter(schema: ['pattern' => '\d']),
     ],
     provider: [self::class, 'collectionProvider']
 )]

diff --git a/tests/Fixtures/TestBundle/Filter/PatternFilter.php b/tests/Fixtures/TestBundle/Filter/PatternFilter.php
@@ -36,7 +36,7 @@ public function getDescription(string $resourceClass): array
                 'type' => 'string',
                 'required' => false,
                 'schema' => [
-                    'pattern' => '/^(pattern|nrettap)$/',
+                    'pattern' => '^(pattern|nrettap)$',
                 ],
             ],
         ];

diff --git a/tests/Functional/Parameters/ValidationTest.php b/tests/Functional/Parameters/ValidationTest.php
@@ -113,7 +113,7 @@ public static function provideQueryStrings(): array
 
     public function testBlank(): void
     {
-        $response = self::createClient()->request('GET', 'validate_parameters?blank=f');
+        self::createClient()->request('GET', 'validate_parameters?blank=f');
         $this->assertResponseIsSuccessful();
     }
 
@@ -146,4 +146,10 @@ public function testValidatePropertyPlaceholder(): void
             ],
         ], $response->toArray(false));
     }
+
+    public function testValidatePattern(): void
+    {
+        self::createClient()->request('GET', 'validate_parameters?pattern=2');
+        $this->assertResponseIsSuccessful();
+    }
 }