Merge "Add @coversNothing to tests that don't cover specific PHP classes"