Merge branch '3.4' into 4.2

* 3.4:
  Added a note about UniqueEntity and collections
  Added a note about PHPUnit setLocale() method

Author: javiereguiluz

components/phpunit_bridge.rst

@@ -10,7 +10,8 @@ The PHPUnit Bridge
 
 It comes with the following features:
 
-* Forces the tests to use a consistent locale (``C``);
+* Forces the tests to use a consistent locale (``C``) (if you create
+  locale-sensitive tests, use PHPUnit's ``setLocale()`` method);
 
 * Auto-register ``class_exists`` to load Doctrine annotations (when used);
 

reference/constraints/UniqueEntity.rst

@@ -110,6 +110,12 @@ between all of the constraints in your user table:
     this validation has passed and before this entity is actually persisted in
     the database.
 
+.. caution::
+
+    This constraint cannot deal with duplicates found in a collection of items
+    that haven't been persisted as entities yet. You'll need to create your own
+    validator to handle that case.
+
 Options
 -------