Updating code for new PHP versions
Merge branch 'master' into puphpeteer-installer