Skip to content

Commit 72731fd

Browse files
Merge branch '6.4' into 7.0
* 6.4: [AssetMapper] Fixing jsdelivr regex to catch 2x export syntax in a row Fix merge NoSuspiciousCharacters custom error messages fix
2 parents 5e45191 + cc8db75 commit 72731fd

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Constraints/NoSuspiciousCharacters.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ public function __construct(
9999

100100
parent::__construct($options, $groups, $payload);
101101

102-
$this->restrictionLevelMessage ??= $restrictionLevelMessage;
103-
$this->invisibleMessage ??= $invisibleMessage;
104-
$this->mixedNumbersMessage ??= $mixedNumbersMessage;
105-
$this->hiddenOverlayMessage ??= $hiddenOverlayMessage;
106-
$this->checks ??= $checks;
107-
$this->restrictionLevel ??= $restrictionLevel;
108-
$this->locales ??= $locales;
102+
$this->restrictionLevelMessage = $restrictionLevelMessage ?? $this->restrictionLevelMessage;
103+
$this->invisibleMessage = $invisibleMessage ?? $this->invisibleMessage;
104+
$this->mixedNumbersMessage = $mixedNumbersMessage ?? $this->mixedNumbersMessage;
105+
$this->hiddenOverlayMessage = $hiddenOverlayMessage ?? $this->hiddenOverlayMessage;
106+
$this->checks = $checks ?? $this->checks;
107+
$this->restrictionLevel = $restrictionLevel ?? $this->restrictionLevel;
108+
$this->locales = $locales ?? $this->locales;
109109
}
110110
}

0 commit comments

Comments
 (0)