Update .travis.yml
Update composer.json
empty tests are not allowed
Merge branch 'master' into 2.1

* master:
  empty tests are not allowed
  Update composer.json
  Update .travis.yml