Merge "Fix PhanUndeclaredType* errors (#3)"