From c30dd48e2a55d3460826cfad40cc14c2b3909c65 Mon Sep 17 00:00:00 2001 From: jperras Date: Wed, 1 Jul 2009 22:25:22 +0000 Subject: [PATCH] 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 --- cake/libs/set.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/libs/set.php b/cake/libs/set.php index bed03379a..d48adc7de 100644 --- a/cake/libs/set.php +++ b/cake/libs/set.php @@ -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.