Skip to content
Snippets Groups Projects
Commit 574dfdc3 authored by catch's avatar catch
Browse files

Issue #3427737 by longwave, godotislate: Overwrite Symfony constraint...

Issue #3427737 by longwave, godotislate: Overwrite Symfony constraint properties in constructors instead of child properties

(cherry picked from commit f0071e24)
parent d3a13779
No related branches found
No related tags found
25 merge requests!10602Issue #3438769 by vinmayiswamy, antonnavi, michelle, amateescu: Sub workspace does not clear,!10301Issue #3469309 by mstrelan, smustgrave, moshe weitzman: Use one-time login...,!10187Issue #3487488 by dakwamine: ExtensionMimeTypeGuesser::guessMimeType must support file names with "0" (zero) like foo.0.zip,!9944Issue #3483353: Consider making the createCopy config action optionally fail...,!9929Issue #3445469 by pooja_sharma, smustgrave: Add additional test coverage for...,!9787Resolve issue 3479427 - bootstrap barrio issue under Windows,!9742Issue #3463908 by catch, quietone: Split OptionsFieldUiTest into two,!9526Issue #3458177 by mondrake, catch, quietone, godotislate, longwave, larowlan,...,!8738Issue #3424162 by camilledavis, dineshkumarbollu, smustgrave: Claro...,!8704Make greek characters available in ckeditor5,!8597Draft: Issue #3442259 by catch, quietone, dww: Reduce time of Migrate Upgrade tests...,!8533Issue #3446962 by kim.pepper: Remove incorrectly added...,!8517Issue #3443748 by NexusNovaz, smustgrave: Testcase creates false positive,!8325Update file Sort.php,!8095Expose document root on install,!7930Resolve #3427374 "Taxonomytid viewsargumentdefault plugin",!7627Issue #3439440 by nicxvan, Binoli Lalani, longwave: Remove country support from DateFormatter,!7445Issue #3440169: When using drupalGet(), provide an associative array for $headers,!7401#3271894 Fix documented StreamWrapperInterface return types for realpath() and dirname(),!7384Add constraints to system.advisories,!7078Issue #3320569 by Spokje, mondrake, smustgrave, longwave, quietone, Lendude,...,!6622Issue #2559833 by piggito, mohit_aghera, larowlan, guptahemant, vakulrai,...,!6502Draft: Resolve #2938524 "Plach testing issue",!38582585169-10.1.x,!3226Issue #2987537: Custom menu link entity type should not declare "bundle" entity key
Pipeline #119468 passed with warnings
+1
......@@ -27,10 +27,6 @@
# testing using \Symfony\Component\ErrorHandler\DebugClassLoader.
%The "Twig\\Environment::getTemplateClass\(\)" method is considered internal\. It may change without further notice\. You should not extend it from "Drupal\\Core\\Template\\TwigEnvironment"\.%
# Skip deprecations warning for overriding Symfony properties in validation
# constraints. See https://www.drupal.org/project/drupal/issues/3425150.
%The "Symfony\\Component\\Validator\\Constraints\\[^"]+::\$[^"]+" property is considered final. You should not override it in "[^"]+"%
# Drupal 11.
%Drupal\\Core\\Form\\FormBuilder::getForm\(\).* will require a new "mixed \.\.\. \$args" argument in the next major version of its interface%
%Drupal\\Core\\Form\\FormBuilder::submitForm\(\).* will require a new "mixed \.\.\. \$args" argument in the next major version of its interface%
......
......@@ -17,8 +17,14 @@
)]
class AllowedValuesConstraint extends Choice {
public $strict = TRUE;
public $minMessage = 'You must select at least %limit choice.|You must select at least %limit choices.';
public $maxMessage = 'You must select at most %limit choice.|You must select at most %limit choices.';
/**
* {@inheritdoc}
*/
public function __construct(...$args) {
$this->strict = TRUE;
$this->minMessage = 'You must select at least %limit choice.|You must select at least %limit choices.';
$this->maxMessage = 'You must select at most %limit choice.|You must select at most %limit choices.';
parent::__construct(...$args);
}
}
......@@ -18,9 +18,15 @@
)]
class CountConstraint extends Count {
public $minMessage = 'This collection should contain %limit element or more.|This collection should contain %limit elements or more.';
public $maxMessage = 'This collection should contain %limit element or less.|This collection should contain %limit elements or less.';
public $exactMessage = 'This collection should contain exactly %limit element.|This collection should contain exactly %limit elements.';
/**
* {@inheritdoc}
*/
public function __construct(...$args) {
$this->minMessage = 'This collection should contain %limit element or more.|This collection should contain %limit elements or more.';
$this->maxMessage = 'This collection should contain %limit element or less.|This collection should contain %limit elements or less.';
$this->exactMessage = 'This collection should contain exactly %limit element.|This collection should contain exactly %limit elements.';
parent::__construct(...$args);
}
/**
* {@inheritdoc}
......
......@@ -20,9 +20,9 @@ class EmailConstraint extends Email {
/**
* {@inheritdoc}
*/
public function __construct($options = []) {
$options += ['mode' => 'strict'];
parent::__construct($options);
public function __construct(...$args) {
$this->mode = static::VALIDATION_MODE_STRICT;
parent::__construct(...$args);
}
/**
......
......@@ -20,9 +20,15 @@
)]
class LengthConstraint extends Length {
public $maxMessage = 'This value is too long. It should have %limit character or less.|This value is too long. It should have %limit characters or less.';
public $minMessage = 'This value is too short. It should have %limit character or more.|This value is too short. It should have %limit characters or more.';
public $exactMessage = 'This value should have exactly %limit character.|This value should have exactly %limit characters.';
/**
* {@inheritdoc}
*/
public function __construct(...$args) {
$this->maxMessage = 'This value is too long. It should have %limit character or less.|This value is too long. It should have %limit characters or less.';
$this->minMessage = 'This value is too short. It should have %limit character or more.|This value is too short. It should have %limit characters or more.';
$this->exactMessage = 'This value should have exactly %limit character.|This value should have exactly %limit characters.';
parent::__construct(...$args);
}
/**
* {@inheritdoc}
......
......@@ -23,15 +23,11 @@ class RangeConstraint extends Range {
/**
* {@inheritdoc}
*/
public function __construct(array $options = NULL) {
if (isset($options['min']) && isset($options['max'])) {
$options['notInRangeMessage'] = $options['notInRangeMessage'] ?? 'This value should be between %min and %max.';
}
else {
$options['minMessage'] = $options['minMessage'] ?? 'This value should be %limit or more.';
$options['maxMessage'] = $options['maxMessage'] ?? 'This value should be %limit or less.';
}
parent::__construct($options);
public function __construct(...$args) {
$this->notInRangeMessage = 'This value should be between %min and %max.';
$this->minMessage = 'This value should be %limit or more.';
$this->maxMessage = 'This value should be %limit or less.';
parent::__construct(...$args);
}
}
......@@ -17,8 +17,6 @@
)]
class RegexConstraint extends Regex {
public $message = 'This value is not valid.';
/**
* {@inheritdoc}
*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment