Take updates from upstream

Pulls in configurable error options from https://github.com/squizlabs/PHP_CodeSniffer/edit/master/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php