[Validator] Fixed Constraint class to not destroy custom groups upon …

…serialization
symfony · Aug 18, 2014 · a085366 · a085366
1 parent 0cc47b4
commit a085366
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/Constraint.php b/Constraint.php
@@ -274,7 +274,7 @@ public function getTargets()
     public function __sleep()
     {
         // Initialize "groups" option if it is not set
-        $this->__get('groups');
+        $this->groups;
 
         return array_keys(get_object_vars($this));
     }

diff --git a/Tests/ConstraintTest.php b/Tests/ConstraintTest.php
@@ -167,22 +167,34 @@ public function testSerialize()
         $this->assertEquals($constraint, $restoredConstraint);
     }
 
-    public function testSerializeInitializesGroupsOption()
+    public function testSerializeInitializesGroupsOptionToDefault()
     {
-        $constraintWithExplicitGroup = new ConstraintA(array(
+        $constraint = new ConstraintA(array(
+            'property1' => 'foo',
+            'property2' => 'bar',
+        ));
+
+        $constraint = unserialize(serialize($constraint));
+
+        $expected = new ConstraintA(array(
             'property1' => 'foo',
             'property2' => 'bar',
             'groups' => 'Default',
         ));
 
-        $constraintWithoutExplicitGroup = new ConstraintA(array(
+        $this->assertEquals($expected, $constraint);
+    }
+
+    public function testSerializeKeepsCustomGroups()
+    {
+        $constraint = new ConstraintA(array(
             'property1' => 'foo',
             'property2' => 'bar',
+            'groups' => 'MyGroup',
         ));
 
-        $constraintWithExplicitGroup = unserialize(serialize($constraintWithExplicitGroup));
-        $constraintWithoutExplicitGroup = unserialize(serialize($constraintWithoutExplicitGroup));
+        $constraint = unserialize(serialize($constraint));
 
-        $this->assertEquals($constraintWithExplicitGroup, $constraintWithoutExplicitGroup);
+        $this->assertSame(array('MyGroup'), $constraint->groups);
     }
 }