diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #11691 [Validator] Fixed Constraint class to not destroy custom groups upon serialization (webmozart)

Browse Source 
This PR was merged into the 2.6-dev branch.

Discussion
----------

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

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #11638
| License       | MIT
| Doc PR        | -

Commits
-------

d405f43 [Validator] Fixed Constraint class to not destroy custom groups upon serialization
This commit is contained in:
Bernhard Schussek 2014-08-19 10:15:39 +02:00
commit a6beede7d7
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Validator/Constraint.php
View File

@ -274,7 +274,7 @@ abstract class Constraint
public function __sleep() public function __sleep()
{ {
// Initialize "groups" option if it is not set // Initialize "groups" option if it is not set
$this->__get('groups'); $this->groups;
return array_keys(get_object_vars($this)); return array_keys(get_object_vars($this));
} }

24
src/Symfony/Component/Validator/Tests/ConstraintTest.php
View File

@ -167,22 +167,34 @@ class ConstraintTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($constraint, $restoredConstraint); $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', 'property1' => 'foo',
'property2' => 'bar', 'property2' => 'bar',
'groups' => 'Default', 'groups' => 'Default',
)); ));
$constraintWithoutExplicitGroup = new ConstraintA(array( $this->assertEquals($expected, $constraint);
}
public function testSerializeKeepsCustomGroups()
{
$constraint = new ConstraintA(array(
'property1' => 'foo', 'property1' => 'foo',
'property2' => 'bar', 'property2' => 'bar',
'groups' => 'MyGroup',
)); ));
$constraintWithExplicitGroup = unserialize(serialize($constraintWithExplicitGroup)); $constraint = unserialize(serialize($constraint));
$constraintWithoutExplicitGroup = unserialize(serialize($constraintWithoutExplicitGroup));
$this->assertEquals($constraintWithExplicitGroup, $constraintWithoutExplicitGroup); $this->assertSame(array('MyGroup'), $constraint->groups);
} }
} }