updated with last CodeSniffer changes