Merge branch '9-fix-builds-post-release-of-php-8' into 'master'

Resolve "Fix builds post-release of PHP-8"

Closes #9

See merge request !13