Upgraded phpunit
Merge pull request #3494 from GrahamCampbell/phpunit4

Upgraded phpunit