Updated for phpunit 4.0
Merge pull request #3818 from GrahamCampbell/4.1-phpunit

[4.1] PHPUnit 4.0