Merge branch 'master' into master-phpcs-error-fix

This commit is contained in:
Saleh Souzanchi 2013-12-23 11:31:43 +03:30
commit 328125ad43

View file

@ -324,7 +324,7 @@ class Hash {
* @param string $groupPath A dot-separated string. * @param string $groupPath A dot-separated string.
* @return array Combined array * @return array Combined array
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::combine * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::combine
* @throws CakeException * @throws CakeException CakeException When keys and values count is unequal.
*/ */
public static function combine(array $data, $keyPath, $valuePath = null, $groupPath = null) { public static function combine(array $data, $keyPath, $valuePath = null, $groupPath = null) {
if (empty($data)) { if (empty($data)) {