Composer stable for PHPunit (backport to master)

See #3104 - just realised I was a moron and PR'd to the wrong branch.