scrutinizer-ci patches

This Pull Request will fix all the issues related with wrong annotations and other issues with using classes etc.