Phpunit composer

Merge this fix into our master so that we don't need to wait for next version only for this fix.