add delimiter to preg_match pattern

Peter Geri · Peter Geri · commit ec5ed08f0ea9 · 2021-07-27T15:42:54.000+02:00
diff --git a/src/Entity/Constraint/PatternConstraint.php b/src/Entity/Constraint/PatternConstraint.php
@@ -10,7 +10,7 @@
 
 class PatternConstraint implements ConstraintInterface
 {
-    private ?string $pattern = null;
+    private ?string $pattern;
 
     public function __construct(?string $pattern)
     {
@@ -30,7 +30,7 @@ public function exists(): bool
     public function getIfCondition(Variable $variable, CodeBuilder $builder): Expr
     {
         return $builder->notEquals(
-            $builder->funcCall('preg_match', [$builder->val($this->pattern), $variable]),
+            $builder->funcCall('preg_match', [$builder->val('/' . $this->pattern . '/'), $variable]),
             $builder->val(1)
         );
     }
diff --git a/test/suite/functional/Generator/Schema/ItemPhp70.php b/test/suite/functional/Generator/Schema/ItemPhp70.php
@@ -249,7 +249,7 @@ public function setOptionalStringWithMinMaxLength(string $optionalStringWithMinM
      */
     public function setOptionalStringWithPattern(string $optionalStringWithPattern): self
     {
-        if (\preg_match('^\\d{3}-\\d{2}-\\d{4}$', $optionalStringWithPattern) !== 1) {
+        if (\preg_match('/^\\d{3}-\\d{2}-\\d{4}$/', $optionalStringWithPattern) !== 1) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Pattern is ^\\d{3}-\\d{2}-\\d{4}$.', 'optionalStringWithPattern', $optionalStringWithPattern));
         }
         $this->optionalStringWithPattern = $optionalStringWithPattern;
diff --git a/test/suite/functional/Generator/Schema/ItemPhp72.php b/test/suite/functional/Generator/Schema/ItemPhp72.php
@@ -242,7 +242,7 @@ public function setOptionalStringWithMinMaxLength(string $optionalStringWithMinM
      */
     public function setOptionalStringWithPattern(string $optionalStringWithPattern): self
     {
-        if (\preg_match('^\\d{3}-\\d{2}-\\d{4}$', $optionalStringWithPattern) !== 1) {
+        if (\preg_match('/^\\d{3}-\\d{2}-\\d{4}$/', $optionalStringWithPattern) !== 1) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Pattern is ^\\d{3}-\\d{2}-\\d{4}$.', 'optionalStringWithPattern', $optionalStringWithPattern));
         }
         $this->optionalStringWithPattern = $optionalStringWithPattern;
diff --git a/test/suite/functional/Generator/Schema/ItemPhp74.php b/test/suite/functional/Generator/Schema/ItemPhp74.php
@@ -214,7 +214,7 @@ public function setOptionalStringWithMinMaxLength(string $optionalStringWithMinM
      */
     public function setOptionalStringWithPattern(string $optionalStringWithPattern): self
     {
-        if (\preg_match('^\\d{3}-\\d{2}-\\d{4}$', $optionalStringWithPattern) !== 1) {
+        if (\preg_match('/^\\d{3}-\\d{2}-\\d{4}$/', $optionalStringWithPattern) !== 1) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Pattern is ^\\d{3}-\\d{2}-\\d{4}$.', 'optionalStringWithPattern', $optionalStringWithPattern));
         }
         $this->optionalStringWithPattern = $optionalStringWithPattern;

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`class PatternConstraint implements ConstraintInterface`
`12`	`12`	`{`
`13`		`- private ?string $pattern = null;`
	`13`	`+ private ?string $pattern;`
`14`	`14`
`15`	`15`	`public function __construct(?string $pattern)`
`16`	`16`	`{`
`@@ -30,7 +30,7 @@ public function exists(): bool`
`30`	`30`	`public function getIfCondition(Variable $variable, CodeBuilder $builder): Expr`
`31`	`31`	`{`
`32`	`32`	`return $builder->notEquals(`
`33`		`- $builder->funcCall('preg_match', [$builder->val($this->pattern), $variable]),`
	`33`	`+ $builder->funcCall('preg_match', [$builder->val('/' . $this->pattern . '/'), $variable]),`
`34`	`34`	`$builder->val(1)`
`35`	`35`	`);`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ public function setOptionalStringWithMinMaxLength(string $optionalStringWithMinM`
`249`	`249`	`*/`
`250`	`250`	`public function setOptionalStringWithPattern(string $optionalStringWithPattern): self`
`251`	`251`	`{`
`252`		`- if (\preg_match('^\\d{3}-\\d{2}-\\d{4}$', $optionalStringWithPattern) !== 1) {`
	`252`	`+ if (\preg_match('/^\\d{3}-\\d{2}-\\d{4}$/', $optionalStringWithPattern) !== 1) {`
`253`	`253`	throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Pattern is ^\\d{3}-\\d{2}-\\d{4}$.', 'optionalStringWithPattern', $optionalStringWithPattern));
`254`	`254`	`}`
`255`	`255`	`$this->optionalStringWithPattern = $optionalStringWithPattern;`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ public function setOptionalStringWithMinMaxLength(string $optionalStringWithMinM`
`242`	`242`	`*/`
`243`	`243`	`public function setOptionalStringWithPattern(string $optionalStringWithPattern): self`
`244`	`244`	`{`
`245`		`- if (\preg_match('^\\d{3}-\\d{2}-\\d{4}$', $optionalStringWithPattern) !== 1) {`
	`245`	`+ if (\preg_match('/^\\d{3}-\\d{2}-\\d{4}$/', $optionalStringWithPattern) !== 1) {`
`246`	`246`	throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Pattern is ^\\d{3}-\\d{2}-\\d{4}$.', 'optionalStringWithPattern', $optionalStringWithPattern));
`247`	`247`	`}`
`248`	`248`	`$this->optionalStringWithPattern = $optionalStringWithPattern;`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ public function setOptionalStringWithMinMaxLength(string $optionalStringWithMinM`
`214`	`214`	`*/`
`215`	`215`	`public function setOptionalStringWithPattern(string $optionalStringWithPattern): self`
`216`	`216`	`{`
`217`		`- if (\preg_match('^\\d{3}-\\d{2}-\\d{4}$', $optionalStringWithPattern) !== 1) {`
	`217`	`+ if (\preg_match('/^\\d{3}-\\d{2}-\\d{4}$/', $optionalStringWithPattern) !== 1) {`
`218`	`218`	throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Pattern is ^\\d{3}-\\d{2}-\\d{4}$.', 'optionalStringWithPattern', $optionalStringWithPattern));
`219`	`219`	`}`
`220`	`220`	`$this->optionalStringWithPattern = $optionalStringWithPattern;`