[2.6] CS Fixes And Removed An Unused Import

| 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 fixes some cs issues in symfony 2.6.

This is the sequel to #12856.
Well, that's now it's meant to look? Either that, or we shunt it all onto one line?