Enable the PhpdocTypesOrderFixer again

[driftingly]

This can be enabled now that PHP-CS-Fixer/PHP-CS-Fixer#6243 has been merged.

Originally added here.

I originally created PR #4392 but couldn't seem to switch the base branch.

[m-vo]

I originally created PR #4392 but couldn't seem to switch the base branch.

You can do this by clicking Edit near the title and then picking a branch from the select menu.

[driftingly]

When I did that the PR ended up having like 520 commits and a couple conflicts 🤷

[m-vo]

When I did that the PR ended up having like 520 commits and a couple conflicts shrug

That is expected as you based your commits onto the wrong branch then. To fix, you need to rebase your local branch.

E.g. run git rebase <old-target-branch> --onto=<new-target-branch> and then force push.

[driftingly]

Ah, thanks!

[m-vo]

The PHP-CS-Fixer version needs to be bumped to 3.6.0 as well. Currently it's a transitive dependency of ECS, so we either need to add it to make it a hard one or update to a version of ECS that requires it as well before this can be merged.

[ausi]

Updated ecs in 05cc6c6

[leofeyer]

Thank you @driftingly.