Skip to content
Snippets Groups Projects
Commit f0071e24 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
parent d675ece2
No related branches found
No related tags found
32 merge requests!12227Issue #3181946 by jonmcl, mglaman,!11131[10.4.x-only-DO-NOT-MERGE]: Issue ##2842525 Ajax attached to Views exposed filter form does not trigger callbacks,!9470[10.3.x-only-DO-NOT-MERGE]: #3331771 Fix file_get_contents(): Passing null to parameter,!8540Issue #3457061: Bootstrap Modal dialog Not closing after 10.3.0 Update,!8528Issue #3456871 by Tim Bozeman: Support NULL services,!8373Issue #3427374 by danflanagan8, Vighneshh: taxonomy_tid ViewsArgumentDefault...,!7526Expose roles in response,!7352Draft: Resolve #3203489 "Set filename as",!5423Draft: Resolve #3329907 "Test2",!3878Removed unused condition head title for views,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3478Issue #3337882: Deleted menus are not removed from content type config,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3133core/modules/system/css/components/hidden.module.css,!2964Issue #2865710 : Dependencies from only one instance of a widget are used in display modes,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2794Issue #3100732: Allow specifying `meta` data on JSON:API objects,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2062Issue #3246454: Add weekly granularity to views date sort,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!877Issue #2708101: Default value for link text is not saved,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493
Pipeline #119470 canceled
......@@ -23,10 +23,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}
*/
......
  • catch @catch

    mentioned in commit 574dfdc3

    ·

    mentioned in commit 574dfdc3

    Toggle commit list
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment