Merge pull request #20923 from totten/master-phptype