From caffbe04a2c8ac34cf97b0011dd28f0e22ad1a6e Mon Sep 17 00:00:00 2001 From: aleeeftw Date: Sun, 1 Nov 2015 10:43:03 +0000 Subject: [PATCH] Minor docblock correction MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The documentation for the method ‘addJoinedEntityFromClassMetadata’ is wrong. As we can see currently says you need to pass an object and that is wrong. The $relation variable is passed to ‘addJoinedEntityResult’ which is using it as a ‘string’. --- lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php b/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php index 804a208ef..1388afd6d 100644 --- a/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php +++ b/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php @@ -110,7 +110,7 @@ class ResultSetMappingBuilder extends ResultSetMapping * @param string $class The class name of the joined entity. * @param string $alias The unique alias to use for the joined entity. * @param string $parentAlias The alias of the entity result that is the parent of this joined result. - * @param object $relation The association field that connects the parent entity result + * @param string $relation The association field that connects the parent entity result * with the joined entity result. * @param array $renamedColumns Columns that have been renamed (tableColumnName => queryColumnName). * @param int|null $renameMode One of the COLUMN_RENAMING_* constants or array for BC reasons (CUSTOM).