Updating doc block for Set::combine first parameter - may accept an object as first param, in addition to arrays.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8210 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
jperras 2009-07-01 22:25:22 +00:00
parent 975e4452d2
commit c30dd48e2a

View file

@ -918,7 +918,7 @@ class Set extends Object {
* to null (useful for Set::merge). You can optionally group the values by what is obtained when
* following the path specified in $groupPath.
*
* @param array $data Array from where to extract keys and values
* @param mixed $data Array or object from where to extract keys and values
* @param mixed $path1 As an array, or as a dot-separated string.
* @param mixed $path2 As an array, or as a dot-separated string.
* @param string $groupPath As an array, or as a dot-separated string.