Merge pull request #22454 from braders/phpdoc-types