Merge branch '2.5'

ezsystems · May 24, 2019 · 42f8d8e · 42f8d8e
2 parents 5ed5c97 + 1711f2f
commit 42f8d8e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/lib/Form/DataTransformer/MultilingualSelectionTransformer.php b/lib/Form/DataTransformer/MultilingualSelectionTransformer.php
@@ -43,7 +43,7 @@ public function transform($value)
     public function reverseTransform($value)
     {
         if (!$value) {
-            return null;
+            return [$this->languageCode => []];
         }
 
         return array_merge($this->data->fieldSettings['multilingualOptions'], [$this->languageCode => $value]);

diff --git a/lib/Validator/Constraints/Password.php b/lib/Validator/Constraints/Password.php
@@ -6,6 +6,9 @@
 
 use Symfony\Component\Validator\Constraint;
 
+/**
+ * @Annotation
+ */
 class Password extends Constraint
 {
     /** @var string */
@@ -17,8 +20,8 @@ class Password extends Constraint
     /**
      * {@inheritdoc}
      */
-    public function getTargets(): string
+    public function getTargets(): array
     {
-        return self::CLASS_CONSTRAINT;
+        return [self::CLASS_CONSTRAINT, self::PROPERTY_CONSTRAINT];
     }
 }
diff --git a/tests/RepositoryForms/Validator/Constraints/PasswordTest.php b/tests/RepositoryForms/Validator/Constraints/PasswordTest.php
@@ -30,6 +30,6 @@ public function testValidatedBy()
 
     public function testGetTargets()
     {
-        $this->assertSame(Password::CLASS_CONSTRAINT, $this->constraint->getTargets());
+        $this->assertSame([Password::CLASS_CONSTRAINT, Password::PROPERTY_CONSTRAINT], $this->constraint->getTargets());
     }
 }
diff --git a/tests/RepositoryForms/Validator/Constraints/UserAccountPasswordTest.php b/tests/RepositoryForms/Validator/Constraints/UserAccountPasswordTest.php
@@ -30,6 +30,6 @@ public function testValidatedBy()
 
     public function testGetTargets()
     {
-        $this->assertSame(UserAccountPassword::CLASS_CONSTRAINT, $this->constraint->getTargets());
+        $this->assertSame([UserAccountPassword::CLASS_CONSTRAINT, UserAccountPassword::PROPERTY_CONSTRAINT], $this->constraint->getTargets());
     }
 }