Merge pull request #22449 from mattwire/phpnotices