Merge "Fix phpdoc for type hint for User::makeUpdateConditions()"