Merge pull request #12579 from josephzidell/patch-1

Augment docblock for `Hash::combine()`
This commit is contained in:
Mark Story 2018-09-21 12:01:13 -04:00 committed by GitHub
commit 5b57a1e926
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -384,8 +384,8 @@ class Hash {
* following the path specified in `$groupPath`. * following the path specified in `$groupPath`.
* *
* @param array $data Array from where to extract keys and values * @param array $data Array from where to extract keys and values
* @param string $keyPath A dot-separated string. * @param array|string $keyPath A dot-separated string or array for formatting rules.
* @param string $valuePath A dot-separated string. * @param array|string $valuePath A dot-separated string or array for formatting rules.
* @param string $groupPath A dot-separated string. * @param string $groupPath A dot-separated string.
* @return array Combined array * @return array Combined array
* @link https://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::combine * @link https://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::combine