[ci skip] Merge pull request #5143 from TysonAndre/misc-phpdoc-nits

Fix misc inconsistencies between code and doc comments
7 files changed