Invalid sniff codes passed to --sniffs now show a friendly error message (request #20313)
Fixed array types in function docs
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer/CLI.php
	CodeSniffer/CommentParser/AbstractDocElement.php
	CodeSniffer/CommentParser/PairElement.php
	CodeSniffer/CommentParser/ParameterElement.php
	CodeSniffer/CommentParser/SingleElement.php
	CodeSniffer/Standards/AbstractPatternSniff.php
	CodeSniffer/Standards/AbstractScopeSniff.php
	CodeSniffer/Standards/PSR1/Tests/Classes/ClassDeclarationUnitTest.php
	CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php
	package.xml