PHP 5.4+ strict standards fixes