Issue #2364555 by Mile23: Add @covers annotation, fix some --strict for PHPUnit