Merge branch '2.0' into 2.1

fabpot · fabpot · commit 97fbb28f7543 · 2013-08-06T07:56:20.000+02:00
* 2.0:
  Fixed metadata serialization
diff --git a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
@@ -74,7 +74,8 @@ public function __sleep()
             'class',
             'name',
             'property',
-            'cascaded', // TESTME
+            'cascaded',
+            'collectionCascaded',
         ));
     }
 
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/MemberMetadataTest.php b/src/Symfony/Component/Validator/Tests/Mapping/MemberMetadataTest.php
@@ -69,6 +69,24 @@ public function testSerialize()
 
         $this->assertEquals($this->metadata, $metadata);
     }
+
+    public function testSerializeCollectionCascaded()
+    {
+        $this->metadata->addConstraint(new Valid(array('traverse' => true)));
+
+        $metadata = unserialize(serialize($this->metadata));
+
+        $this->assertEquals($this->metadata, $metadata);
+    }
+
+    public function testSerializeCollectionNotCascaded()
+    {
+        $this->metadata->addConstraint(new Valid(array('traverse' => false)));
+
+        $metadata = unserialize(serialize($this->metadata));
+
+        $this->assertEquals($this->metadata, $metadata);
+    }
 }
 
 class TestMemberMetadata extends MemberMetadata
