Phpcs fixes (psr-2)

This PR fixes issues against the [psr-2](http://www.php-fig.org/psr/psr-2/) coding standard.