Skip to content

Commit cc8db75

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

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
@@ -102,12 +102,12 @@ public function __construct(
102102

103103
parent::__construct($options, $groups, $payload);
104104

105-
$this->restrictionLevelMessage ??= $restrictionLevelMessage;
106-
$this->invisibleMessage ??= $invisibleMessage;
107-
$this->mixedNumbersMessage ??= $mixedNumbersMessage;
108-
$this->hiddenOverlayMessage ??= $hiddenOverlayMessage;
109-
$this->checks ??= $checks;
110-
$this->restrictionLevel ??= $restrictionLevel;
111-
$this->locales ??= $locales;
105+
$this->restrictionLevelMessage = $restrictionLevelMessage ?? $this->restrictionLevelMessage;
106+
$this->invisibleMessage = $invisibleMessage ?? $this->invisibleMessage;
107+
$this->mixedNumbersMessage = $mixedNumbersMessage ?? $this->mixedNumbersMessage;
108+
$this->hiddenOverlayMessage = $hiddenOverlayMessage ?? $this->hiddenOverlayMessage;
109+
$this->checks = $checks ?? $this->checks;
110+
$this->restrictionLevel = $restrictionLevel ?? $this->restrictionLevel;
111+
$this->locales = $locales ?? $this->locales;
112112
}
113113
}

0 commit comments

Comments
 (0)