Rename method so they don't cause E_STRICT errors.

Fixes #3882
Fixing error handler tests for real
Merge remote-tracking branch 'origin/3.0' into 3.0-phpunit