Merge pull request #2532 from bar/patch-2

Trivial continue.

fix phpcs error "Missing @throws tag in function comment"
Merge branch 'master' into master-phpcs-error-fix
Merge pull request #2534 from zoghal/master-phpcs-error-fix

fix phpcs error "Missing @throws tag in function comment"
Merge remote-tracking branch 'cakephp/master' into master-cache-empty