diff --git a/src/ORM/Association.php b/src/ORM/Association.php index 65608e8000e..a1edac572d2 100644 --- a/src/ORM/Association.php +++ b/src/ORM/Association.php @@ -445,9 +445,11 @@ public function attachTo(Query $query, array $options = []) { * source results. * * @param array $row + * @param boolean $joined Whether or not the row is a result of a direct join + * with this association * @return array */ - public function transformRow($row) { + public function transformRow($row, $joined) { $sourceAlias = $this->source()->alias(); $targetAlias = $this->target()->alias(); if (isset($row[$sourceAlias])) { diff --git a/src/ORM/Association/BelongsToMany.php b/src/ORM/Association/BelongsToMany.php index 793b4557cd4..8fac40d3454 100644 --- a/src/ORM/Association/BelongsToMany.php +++ b/src/ORM/Association/BelongsToMany.php @@ -247,15 +247,17 @@ public function attachTo(Query $query, array $options = []) { * source results. * * @param array $row + * @param boolean $joined Whether or not the row is a result of a direct join + * with this association * @return array */ - public function transformRow($row, $joined = false) { + public function transformRow($row, $joined) { $alias = $this->junction()->alias(); if ($joined) { $row[$this->target()->alias()][$this->_junctionProperty] = $row[$alias]; unset($row[$alias]); } - $row = $this->_transformRow($row); + $row = $this->_transformRow($row, $joined); return $row; } diff --git a/src/ORM/Association/ExternalAssociationTrait.php b/src/ORM/Association/ExternalAssociationTrait.php index 0222e432951..68fba6bd7e4 100644 --- a/src/ORM/Association/ExternalAssociationTrait.php +++ b/src/ORM/Association/ExternalAssociationTrait.php @@ -91,9 +91,11 @@ public function requiresKeys($options = []) { * source results. * * @param array $row + * @param boolean $joined Whether or not the row is a result of a direct join + * with this association * @return array */ - public function transformRow($row) { + public function transformRow($row, $joined) { $sourceAlias = $this->source()->alias(); $targetAlias = $this->target()->alias();