Fix unit tests
Fix unit test
[travis] get composer version that support psr4
Merge branch 'sonata-project/master'

Conflicts:
	composer.json