[2.3] CS Fixes

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | N/A
| License       | MIT
| Doc PR        | N/A

##### This pull request provides some cs fixes.
I am probably going to write a fixer for this to go into https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/887, so expect another pull in a week or so.