May 21, 2016 · May 21, 2016 · May 21, 2016 · May 21, 2016 · May 21, 2016 · May 21, 2016
diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst
 Allows you to create a custom query for your choices. See
 :ref:`ref-form-entity-query-builder` for an example.

 The value of this option can either be a ``QueryBuilder`` object ora Closure.
 The value of this option can either be a ``QueryBuilder`` object,a Closure or ``null``.
 When using a Closure, you will be passed the ``EntityRepository`` of the entity
 as the only argument and should return a ``QueryBuilder``.
 as the only argument and should return a ``QueryBuilder``.
 If you'd like to display a list of empty entries, you can return ``null`` in the closure.

 Overridden Options
 ------------------
Original file line number	Diff line number	Diff line change
Expand Up		@@ -202,9 +202,10 @@ query_builder
		Allows you to create a custom query for your choices. See
		:ref:`ref-form-entity-query-builder` for an example.

		The value of this option can either be a ``QueryBuilder`` object ora Closure.
		The value of this option can either be a ``QueryBuilder`` object,a Closure or ``null``.
Copy link Contributor HeahDudeMay 21, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Needs a rebase here when#6596 is merged in 2.8 Copy link Member wouterjMay 21, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I'll take care of that while merging.
		When using a Closure, you will be passed the ``EntityRepository`` of the entity
		as the only argument and should return a ``QueryBuilder``.
		as the only argument and should return a ``QueryBuilder``.
		If you'd like to display a list of empty entries, you can return ``null`` in the closure.
Copy link Contributor HeahDudeMay 21, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Unless I'm missing something when`null` is returned it loads all entities. Copy link Member xabbuhMay 21, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. When you set the option to`null`, but not when return`null` in the closure, isn't it? Copy link Contributor HeahDudeMay 21, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Why that? The only difference is that it's conditional. ? Copy link Member xabbuhMay 21, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I don't think so (seehttps://github.com/symfony/symfony/pull/13990/files#diff-888009597299c21d535422fd4368bed3R72). Copy link Contributor HeahDudeMay 21, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Ok so I've missed the point of that feature, thanks for the enlightening! Copy link Contributor HeahDudeMay 21, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. @xabbuh Looks likesymfony/symfony@`317d30b` has not made it to the core !? (neithermaster nor2.8) Copy link Member wouterjMay 21, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Looks like there was something wrong with the commit and it was fixed insymfony/symfony@`eb08baa` The tests exists and passes:https://github.com/symfony/symfony/blob/master/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php#L212-L223 Copy link Contributor HeahDudeMay 21, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. seesymfony/symfony#13990 (comment)

		Overridden Options
		------------------
Expand Down