Merge branch '2.7' into 2.8

xabbuh · xabbuh · commit ecee317b3dd2 · 2016-12-14T20:03:00.000+01:00
* 2.7: [#7220] some minor tweaks Update 'query_builder' option
diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst
@@ -211,6 +211,14 @@ loading all entities.
 .. versionadded:: 2.8
     Returning ``null`` in the Closure was introduced in Symfony 2.8.
 
+.. caution::
+
+    The entity used in the ``FROM`` clause of the `query_builder`_ option
+    will always be validated against the class which you have specified with
+    the form's `class`_ option. If you return another entity instead of the
+    one used in your ``FROM`` clause (for instance if you return an entity
+    from a joined table), it will break validation.
+    
 Overridden Options
 ------------------
 
