Add phpunit dev require + upgrade to PSR4
Add DoctrineEmptyCollection Filter
Add DoctrineEmptyCollection Filter
Merge remote-tracking branch 'origin/feature-2'