Merge pull request #23947 from totten/master-php81-global