Fix random CS issues in code & phpdocs
Merge pull request #1952 from stloyd/bugfix/cs_fixes

Fix random CS issues in code & phpdocs