Scrutinizer fix and PHPDoc