PSR-2 : space and new line change for if, foreach, class, and function
Merge branch 'hotfix/1030'

Close #1030
Merge pull request #1031 from samsonasik/psr2-fix

PSR-2 : space and new line change for if, foreach, class, and function
Merge branch 'hotfix/1031' into develop

Forward port #1031