From 09a6fd70b8fb4896ab5b8257997d38bc463772b6 Mon Sep 17 00:00:00 2001 From: Eric GELOEN Date: Sat, 18 Oct 2014 16:05:35 +0200 Subject: [PATCH] [Form] Add entity manager instance support for em option --- reference/forms/types/entity.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst index dcada6d96eb..17728fa3be9 100644 --- a/reference/forms/types/entity.rst +++ b/reference/forms/types/entity.rst @@ -117,7 +117,7 @@ or the short alias name (as shown prior). em ~~ -**type**: ``string`` **default**: the default entity manager +**type**: ``string`` | ``Doctrine\Common\Persistence\ObjectManager`` **default**: the default entity manager If specified, the specified entity manager will be used to load the choices instead of the default entity manager. @@ -183,7 +183,7 @@ directly. choices ~~~~~~~ -**type**: array || ``\Traversable`` **default**: ``null`` +**type**: array | ``\Traversable`` **default**: ``null`` Instead of allowing the `class`_ and `query_builder`_ options to fetch the entities to include for you, you can pass the ``choices`` option directly.