Merge "Fix phpdoc since $proto can be int"