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