Fix mismatches between the PHPDoc and the method signatures