Improvements and compatibility with PHP 8.4#3

mattrenner merged 3 commits intophindmarsh:masterphindmarsh/statham:masterfrom

hellpizza:php-84hellpizza/statham:php-84Copy head branch name to clipboard