Skip to content

Commit 6c246b7

Browse files
authored
Merge pull request #2417 from dev-craftec/bugfix/regex-validator-constructor-fix
FIx usage of Regex validator constructor
2 parents 8ce9c0c + aa58577 commit 6c246b7

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

Controller/Annotations/AbstractScalarParam.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ public function getConstraints()
4141
if ($this->requirements instanceof Constraint) {
4242
$constraints[] = $this->requirements;
4343
} elseif (is_scalar($this->requirements)) {
44-
$constraints[] = new Regex([
45-
'pattern' => '#^(?:'.$this->requirements.')$#xsu',
46-
'message' => sprintf(
44+
$constraints[] = new Regex(
45+
'#^(?:'.$this->requirements.')$#xsu',
46+
sprintf(
4747
'Parameter \'%s\' value, does not match requirements \'%s\'',
4848
$this->getName(),
4949
$this->requirements
5050
),
51-
]);
51+
);
5252
} elseif (is_array($this->requirements) && isset($this->requirements['rule']) && $this->requirements['error_message']) {
53-
$constraints[] = new Regex([
54-
'pattern' => '#^(?:'.$this->requirements['rule'].')$#xsu',
55-
'message' => $this->requirements['error_message'],
56-
]);
53+
$constraints[] = new Regex(
54+
'#^(?:'.$this->requirements['rule'].')$#xsu',
55+
$this->requirements['error_message'],
56+
);
5757
} elseif (is_array($this->requirements)) {
5858
foreach ($this->requirements as $index => $requirement) {
5959
if ($requirement instanceof Constraint) {

0 commit comments

Comments
 (0)