~ Properly define constraints for CurrentUserPasswordField

passioneight · Jan 2, 2021 · 749a09c · 749a09c
1 parent e94535b
commit 749a09c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/src/Form/Field/Text/CurrentUserPasswordField.php b/src/Form/Field/Text/CurrentUserPasswordField.php
@@ -9,15 +9,12 @@ class CurrentUserPasswordField extends PasswordField
     const NAME = "current-password";
 
     /**
-     * @return array
+     * @inheritdoc
      */
-    public function getDefaultOptions(): array
+    protected function getDefaultConstraints(): array
     {
-        $defaultOptions = parent::getDefaultOptions();
-        return array_merge_recursive($defaultOptions, [
-            'constraints' => [
-                new CurrentUserPasswordConstraint()
-            ]
+        return array_merge(parent::getDefaultConstraints(), [
+            new CurrentUserPasswordConstraint()
         ]);
     }
 }
diff --git a/src/Form/Field/Text/PasswordField.php b/src/Form/Field/Text/PasswordField.php
@@ -51,13 +51,21 @@ public function getDefaultOptions(): array
     {
         $defaultOptions = parent::getDefaultOptions();
         return array_merge($defaultOptions, [
-            'constraints' => [
-                new NotBlank(),
-                new Regex([
-                    'pattern' => $this->getPattern(),
-                    'message' => "form.{$this->getName()}.invalid-pattern"
-                ])
-            ]
+            'constraints' => $this->getDefaultConstraints()
         ]);
     }
+
+    /**
+     * @return array
+     */
+    protected function getDefaultConstraints(): array
+    {
+        return [
+            new NotBlank(),
+            new Regex([
+                'pattern' => $this->getPattern(),
+                'message' => "{$this->getName()}.invalid-pattern"
+            ])
+        ];
+    }
 }