Updated lock file
Ran php cs fixer and some manual fixes
Moar cleanup.
Corrected myself
Merge pull request #585 from pvankouteren/no-issue-scrutinizer-fixes

No issue / scrutinizer fixes