RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 13:31:45 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/#1541-minor-docblock-correction-in-resultset-mapping-builder' into 2.5

Browse Source 
Backport #1541 to 2.5
This commit is contained in:
Marco Pivetta 2017-05-20 16:45:59 +02:00
commit c0f0fe060f
No known key found for this signature in database
GPG Key ID: 4167D3337FD9D629
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php
View File

@ -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).