Merge "Correct variable types in phpdoc"