Merge pull request #2532 from bar/patch-2

Trivial continue.

fix phpcs error "Missing @throws tag in function comment"
This commit is contained in:
Mark Story 2013-12-22 20:03:56 -08:00 committed by Saleh Souzanchi
commit 321347e52b
2 changed files with 1 additions and 1 deletions

View file

@ -252,7 +252,6 @@ class CakeEventManager {
if ($result !== null) {
$event->result = $result;
}
continue;
}
}

View file

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