pattern must be compliant with ECMA 262 regex (#4027)

api-platform · Feb 6, 2021 · 8a16c9d · 8a16c9d
1 parent 8a00d6e
commit 8a16c9d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRegexRestriction.php b/...Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRegexRestriction.php
@@ -29,7 +29,7 @@ class PropertySchemaRegexRestriction implements PropertySchemaRestrictionMetadat
      */
     public function create(Constraint $constraint, PropertyMetadata $propertyMetadata): array
     {
-        return isset($constraint->pattern) ? ['pattern' => $constraint->pattern] : [];
+        return $constraint instanceof Regex && $constraint->getHtmlPattern() ? ['pattern' => $constraint->getHtmlPattern()] : [];
     }
 
     /**

diff --git a/tests/Bridge/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactoryTest.php b/tests/Bridge/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactoryTest.php
@@ -300,7 +300,7 @@ public function testCreateWithPropertyRegexRestriction(): void
         $schema = $validationPropertyMetadataFactory->create(DummyValidatedEntity::class, 'dummy')->getSchema();
         $this->assertNotNull($schema);
         $this->assertArrayHasKey('pattern', $schema);
-        $this->assertEquals('^dummy$', $schema['pattern']);
+        $this->assertEquals('dummy', $schema['pattern']);
     }
 
     public function testCreateWithPropertyFormatRestriction(): void

diff --git a/tests/Fixtures/DummyValidatedEntity.php b/tests/Fixtures/DummyValidatedEntity.php
@@ -32,7 +32,7 @@ class DummyValidatedEntity
      *
      * @Assert\NotBlank
      * @Assert\Length(max="4", min="10")
-     * @Assert\Regex(pattern="^dummy$")
+     * @Assert\Regex(pattern="/^dummy$/")
      */
     public $dummy;