Also try to automatically work for future versions of PHP. Fixes #1413 Fixes #1258 Signed-off-by: Joseph Nuthalapati <njoseph@thoughtworks.com> Reviewed-by: James Valleroy <jvalleroy@mailbox.org>