phpcs fixes

Cleanup of the code and phpdoc based on the symfony coding standards