Fix mismatches between the PHPDoc and the method signatures
Merge pull request #3827 from micheh/hotfix/phpdoc-mismatch

Fix mismatches between the PHPDoc and the method signatures