Fix issues identified by running tests on PHP 8
Fix issues identified by running tests on PHP 8

sebastianbergmann/php-code-coverage,sebastianbergmann/php-code-coverage,sebastianbergmann/php-code-coverage