PHP CodeSniffer fixes