Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3425150 by godotislate, longwave: Symfony deprecations in Constraint plugins

merge-requests/7033/merge
catch 2024-03-14 09:53:10 +00:00
parent c703f7ba4e
commit 6663e6489c
18 changed files with 27 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Drupal/Core/Config/Plugin/Validation/Constraint/RequiredConfigDependenciesConstraint.php
View File

@ -37,14 +37,14 @@ class RequiredConfigDependenciesConstraint extends SymfonyConstraint {
/**
* {@inheritdoc}
*/
public function getRequiredOptions() {
public function getRequiredOptions(): array {
return ['entityTypes'];
}
/**
* {@inheritdoc}
*/
public function getDefaultOption() {
public function getDefaultOption(): ?string {
return 'entityTypes';
}

16
core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityHasFieldConstraint.php
View File

@ -39,27 +39,15 @@ class EntityHasFieldConstraint extends SymfonyConstraint {
/**
* {@inheritdoc}
*
* @return ?string
* Name of the default option.
*
* @todo Add method return type declaration.
* @see https://www.drupal.org/project/drupal/issues/3425150
*/
public function getDefaultOption() {
public function getDefaultOption(): ?string {
return 'field_name';
}
/**
* {@inheritdoc}
*
* @return array
* The names of the required options.
*
* @todo Add method return type declaration.
* @see https://www.drupal.org/project/drupal/issues/3425150
*/
public function getRequiredOptions() {
public function getRequiredOptions(): array {
return (array) $this->getDefaultOption();
}

16
core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/ImmutablePropertiesConstraint.php
View File

@ -34,27 +34,15 @@ class ImmutablePropertiesConstraint extends SymfonyConstraint {
/**
* {@inheritdoc}
*
* @return ?string
* Name of the default option.
*
* @todo Add method return type declaration.
* @see https://www.drupal.org/project/drupal/issues/3425150
*/
public function getDefaultOption() {
public function getDefaultOption(): ?string {
return 'properties';
}
/**
* {@inheritdoc}
*
* @return array
* The names of the required options.
*
* @todo Add method return type declaration.
* @see https://www.drupal.org/project/drupal/issues/3425150
*/
public function getRequiredOptions() {
public function getRequiredOptions(): array {
return ['properties'];
}

4
core/lib/Drupal/Core/Extension/Plugin/Validation/Constraint/ExtensionExistsConstraint.php
View File

@ -41,14 +41,14 @@ class ExtensionExistsConstraint extends SymfonyConstraint {
/**
* {@inheritdoc}
*/
public function getRequiredOptions() {
public function getRequiredOptions(): array {
return ['type'];
}
/**
* {@inheritdoc}
*/
public function getDefaultOption() {
public function getDefaultOption(): ?string {
return 'type';
}

16
core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraint.php
View File

@ -47,27 +47,15 @@ class ComplexDataConstraint extends SymfonyConstraint {
/**
* {@inheritdoc}
*
* @return ?string
* Name of the default option.
*
* @todo Add method return type declaration.
* @see https://www.drupal.org/project/drupal/issues/3425150
*/
public function getDefaultOption() {
public function getDefaultOption(): ?string {
return 'properties';
}
/**
* {@inheritdoc}
*
* @return array
* The names of the required options.
*
* @todo Add method return type declaration.
* @see https://www.drupal.org/project/drupal/issues/3425150
*/
public function getRequiredOptions() {
public function getRequiredOptions(): array {
return ['properties'];
}

8
core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/CountConstraint.php
View File

@ -24,14 +24,8 @@ class CountConstraint extends Count {
/**
* {@inheritdoc}
*
* @return string
* The name of the class that validates this constraint.
*
* @todo Add method return type declaration.
* @see https://www.drupal.org/project/drupal/issues/3425150
*/
public function validatedBy() {
public function validatedBy(): string {
return '\Symfony\Component\Validator\Constraints\CountValidator';
}

8
core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailConstraint.php
View File

@ -27,14 +27,8 @@ class EmailConstraint extends Email {
/**
* {@inheritdoc}
*
* @return string
* The name of the class that validates this constraint.
*
* @todo Add method return type declaration.
* @see https://www.drupal.org/project/drupal/issues/3425150
*/
public function validatedBy() {
public function validatedBy(): string {
return EmailValidator::class;
}

16
core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EntityBundleExistsConstraint.php
View File

@ -41,27 +41,15 @@ class EntityBundleExistsConstraint extends SymfonyConstraint {
/**
* {@inheritdoc}
*
* @return ?string
* Name of the default option.
*
* @todo Add method return type declaration.
* @see https://www.drupal.org/project/drupal/issues/3425150
*/
public function getDefaultOption() {
public function getDefaultOption(): ?string {
return 'entityTypeId';
}
/**
* {@inheritdoc}
*
* @return array
* The names of the required options.
*
* @todo Add method return type declaration.
* @see https://www.drupal.org/project/drupal/issues/3425150
*/
public function getRequiredOptions() {
public function getRequiredOptions(): array {
return ['entityTypeId'];
}

8
core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/LengthConstraint.php
View File

@ -26,14 +26,8 @@ class LengthConstraint extends Length {
/**
* {@inheritdoc}
*
* @return string
* The name of the class that validates this constraint.
*
* @todo Add method return type declaration.
* @see https://www.drupal.org/project/drupal/issues/3425150
*/
public function validatedBy() {
public function validatedBy(): string {
return '\Symfony\Component\Validator\Constraints\LengthValidator';
}

8
core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RegexConstraint.php
View File

@ -21,14 +21,8 @@ class RegexConstraint extends Regex {
/**
* {@inheritdoc}
*
* @return string
* The name of the class that validates this constraint.
*
* @todo Add method return type declaration.
* @see https://www.drupal.org/project/drupal/issues/3425150
*/
public function validatedBy() {
public function validatedBy(): string {
return '\Symfony\Component\Validator\Constraints\RegexValidator';
}

6
core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldConstraint.php
View File

@ -18,11 +18,9 @@ class UniqueFieldConstraint extends SymfonyConstraint {
public $message = 'A @entity_type with @field_name %value already exists.';
/**
* Returns the name of the class that validates this constraint.
*
* @return string
* {@inheritdoc}
*/
public function validatedBy() {
public function validatedBy(): string {
return '\Drupal\Core\Validation\Plugin\Validation\Constraint\UniqueFieldValueValidator';
}

8
core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UuidConstraint.php
View File

@ -18,14 +18,8 @@ class UuidConstraint extends Uuid {
/**
* {@inheritdoc}
*
* @return string
* The name of the class that validates this constraint.
*
* @todo Add method return type declaration.
* @see https://www.drupal.org/project/drupal/issues/3425150
*/
public function validatedBy() {
public function validatedBy(): string {
return UuidValidator::class;
}

16
core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ValidKeysConstraint.php
View File

@ -65,27 +65,15 @@ class ValidKeysConstraint extends SymfonyConstraint {
/**
* {@inheritdoc}
*
* @return ?string
* Name of the default option.
*
* @todo Add method return type declaration.
* @see https://www.drupal.org/project/drupal/issues/3425150
*/
public function getDefaultOption() {
public function getDefaultOption(): ?string {
return 'allowedKeys';
}
/**
* {@inheritdoc}
*
* @return array
* The names of the required options.
*
* @todo Add method return type declaration.
* @see https://www.drupal.org/project/drupal/issues/3425150
*/
public function getRequiredOptions() {
public function getRequiredOptions(): array {
return ['allowedKeys'];
}

2
core/modules/ckeditor5/src/Plugin/Validation/Constraint/ToolbarItemDependencyConstraint.php
View File

@ -36,7 +36,7 @@ class ToolbarItemDependencyConstraint extends SymfonyConstraint {
/**
* {@inheritdoc}
*/
public function getRequiredOptions() {
public function getRequiredOptions(): array {
return ['toolbarItem'];
}

2
core/modules/ckeditor5/src/Plugin/Validation/Constraint/UniqueLabelInListConstraint.php
View File

@ -36,7 +36,7 @@ class UniqueLabelInListConstraint extends SymfonyConstraint {
/**
* {@inheritdoc}
*/
public function getRequiredOptions() {
public function getRequiredOptions(): array {
return ['labelKey'];
}

4
core/modules/field/tests/modules/field_test/src/Plugin/Validation/Constraint/TestFieldConstraint.php
View File

@ -19,14 +19,14 @@ class TestFieldConstraint extends NotEqualTo {
/**
* {@inheritdoc}
*/
public function getRequiredOptions() {
public function getRequiredOptions(): array {
return ['value'];
}
/**
* {@inheritdoc}
*/
public function validatedBy() {
public function validatedBy(): string {
return '\Symfony\Component\Validator\Constraints\NotEqualToValidator';
}

2
core/modules/file/src/Plugin/Validation/Constraint/FileExtensionConstraint.php
View File

@ -35,7 +35,7 @@ class FileExtensionConstraint extends SymfonyConstraint {
/**
* {@inheritdoc}
*/
public function getDefaultOption(): string {
public function getDefaultOption(): ?string {
return 'extensions';
}

2
core/modules/file/src/Plugin/Validation/Constraint/FileUriUnique.php
View File

@ -20,7 +20,7 @@ class FileUriUnique extends SymfonyConstraint {
/**
* {@inheritdoc}
*/
public function validatedBy() {
public function validatedBy(): string {
return '\Drupal\Core\Validation\Plugin\Validation\Constraint\UniqueFieldValueValidator';
}