Testing changes for PHP 5.4+ bugs