Merge pull request #22513 from braders/phpdoc-self