fixed code via "PHP Coding Standards Fixer". Thanks @fabpot
fixed tests via "PHP Coding Standards Fixer". Thanks @fabpot
Merge branch 'develop'