Fix the relevant code style fixes from http://fabbot.io/report/symfony/symfony/11976/4fc0f0f35a40701c62019a7a2194df24e3b96de4