Merge "Remove support for non-Composer PHPUnit"