After using phpcbf to fix the coding standard violations, I did some manual adjustments to the changes, especially in poorly indented files.
Closes #15107