phpcs cleanup
Remove extra whitespace
Re-arrange some code for legibility
Merge branch '2.5'

Conflicts:
	src/VIPSoft/DoctrineDataFixturesExtension/Service/FixtureService.php