Skip to content

Allow ObjectCollections->toArray() to serialise without foreign objects. #973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow ObjectCollections->toArray() to serialise without foreign objects. #973

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33a2da5
Conditionally serialize foreign objects on collection toArray
kitsunde Jul 30, 2015
9d6bc9c
Update PHPDocs for collection->toArray
kitsunde Jul 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Propel/Runtime/Collection/ObjectCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ public function fromArray($arr)
* TableMap::TYPE_NUM. Defaults to TableMap::TYPE_PHPNAME.
* @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
* @param array $alreadyDumpedObjects List of objects to skip to avoid recursion
* @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
*
* <code>
* $bookCollection->toArray();
Expand All @@ -160,7 +161,7 @@ public function fromArray($arr)
*
* @return array
*/
public function toArray($keyColumn = null, $usePrefix = false, $keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array())
public function toArray($keyColumn = null, $usePrefix = false, $keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false)
{
$ret = array();
$keyGetterMethod = 'get' . $keyColumn;
Expand All @@ -169,7 +170,7 @@ public function toArray($keyColumn = null, $usePrefix = false, $keyType = TableM
foreach ($this->data as $key => $obj) {
$key = null === $keyColumn ? $key : $obj->$keyGetterMethod();
$key = $usePrefix ? ($this->getModel() . '_' . $key) : $key;
$ret[$key] = $obj->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
$ret[$key] = $obj->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, $includeForeignObjects);
}

return $ret;
Expand Down