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

Fix mismatches between the PHPDoc and the method signatures
Merge branch 'hotfix/3827' into develop

Forward port #3827