Once again, I forgot that short array syntax is tokenized by PHPCS and not PHP
Merge branch 'master' into phpcs-fixer