Clean up some PHPUnit 4 bc stuff
Clean up some PHPUnit 4 bc stuff

Bug: T192167
Change-Id: I5b08e479329503ee651580005fe7347f22939ca4

wikimedia/mediawiki-extensions-Thanks,wikimedia/mediawiki-extensions-Thanks,wikimedia/mediawiki-extensions-Thanks