Fixing PhpAnalyzer findings