Fix PHPAnalyzer warnings
PSR-2 issues