The last one. All file should matched the request of new PSR2 scanner.
Merge branch 'master' into travis.yml-test