Sync with upstream PR https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/834