It looks like the initial change was done in #16035 which was accidentally merged in the 3.0 branch instead of 2.8. So I think the best idea is to backport #16035 to the 2.8 branch and then apply this fix there.

Ok I will try to do that next week. Currently I don't have much time.

@xabbuh I finally have time. I'm not sure how to do this 'backport #16035 to the 2.8 branch'. Can you help me with that?

ping @xabbuh

If the Symfony remote name is upstream on your local machine, you should be able to do something like this when you are on your patch-1 branch:

$ git fetch upstream
$ git cherry-pick 437398d6d03c86552777fdb8ed97c0f9c6cecbd5

I just noticed that you might run into conflicts when doing so. So maybe it's easier to simply copy the missing text to your PR instead.

@xabbuh I checked the PR but I don't see any missing text? The text in my PR seems to match https://github.com/symfony/symfony/pull/16035/files#diff-0901ceb76939b17cd920bc69aa52d21fR728

@eriwin We have some inconsistencies across the different branches. I opened #18927 and #18928 which should synchronise them again.

@xabbuh Thank you. I think I can close this PR?

@eriwin Sorry, I sadly didn't find a way to keep your contribution. :( Though thank you very much for pointing us to these inconcistencies in our upgrade instructions. It's much appreciated!

@xabbuh for the future, you can change the author of a commit using the --author option 👍
http://stackoverflow.com/questions/3042437/change-commit-author-at-one-specific-commit