Ok, I am all for improving the code, but @hanakin what exactly are you suggesting to break, and what is too verbose? Sorry I don't understand your comment precisely. Please, elaborate.

Ill let the dev team comment, but you rewrote the entire files and there is a lot of docblock making it hard to make sense of whats getting changed on here for me, its just not a very clean diff is all

Of course, it is a major rewrite, and it adds significant functionality. The diff does not give you enough information. Maybe looking at the new file alone makes more sense. That is for context, template and base are much clearer.

The failure seems a totally different problem, unrelated to this PR.

Confirmed, the test failure is coming from here bdc3126#diff-80a55b47f049e3e27edb4d6bfd8e7a1dR93

And uncovered by #4622

Fix proposed: #4731

The latest error seems to be coming from the "Merge commit" not having the comment correctly formatted.
Could anyone please squash all commits between 7ad31c9 and c9c49a2? If needed, keep message from first commit.
I cannot do it in my local git and then push it here, and I do not want to play with this repository, as I may break more things than what I would fix.
Thanks a lot.

@javiexin just hard rest with keep changes, stash all, change branches, then re-apply stash and re-commit

@hanakin thanks a lot, but I am not confident with this, and I do not want to mess around with the phpbb repository. Maybe close this request and reopen a new one?
Otherwise, be a bit more explicit, with command that I should type. Sorry but my Git knowledge is very limited :(

First I recommend using a tool like git Tower, makes working with git alot simpler

To not have to use git you could

1. Save backups of the changed files somewhere.
2. git branch -D ticket/15069
3. git checkout master
4. git branch ticket/15069
5. git checkout ticket/15069
6. open files and manually compare with backups and commit changes
7. git push origin ticket/15069 --force https://www.atlassian.com/git/tutorials/syncing#git-push
8. Close pull request
9. Open new pull request against master

Ok, I have now created the new PR against master, following your detailed guide (thanks a lot!!).

But I now still get merge conflicts, that I must resolve, that will result in a commit with an incorrect commit message...

What do I do??

The new PR: #4735