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

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

@@ -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';
   }
 

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

@@ -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();
   }
 

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

@@ -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'];
   }
 

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

@@ -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';
   }
 

core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraint.php

@@ -47,27 +47,15 @@ public function __construct($options = NULL) {
 
   /**
    * {@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'];
   }
 

core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/CountConstraint.php

@@ -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';
   }
 

core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailConstraint.php

@@ -27,14 +27,8 @@ public function __construct($options = []) {
 
   /**
    * {@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;
   }
 

core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EntityBundleExistsConstraint.php

@@ -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'];
   }
 

core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/LengthConstraint.php

@@ -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';
   }
 

core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RegexConstraint.php

@@ -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';
   }
 

core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldConstraint.php

@@ -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';
   }
 

core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UuidConstraint.php

@@ -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;
   }
 

core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ValidKeysConstraint.php

@@ -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'];
   }
 

core/modules/ckeditor5/src/Plugin/Validation/Constraint/ToolbarItemDependencyConstraint.php

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

core/modules/ckeditor5/src/Plugin/Validation/Constraint/UniqueLabelInListConstraint.php

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

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

@@ -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';
   }
 

core/modules/file/src/Plugin/Validation/Constraint/FileExtensionConstraint.php

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

core/modules/file/src/Plugin/Validation/Constraint/FileUriUnique.php

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