Fix docblocks
Merge pull request #6382 from devonzara/fix-dynamic-phpdoc

[5.0] Fix DocBlocks