Merge branch 'hotfix/#6231-fix-http-query-parameters-to-array-cast-on-hhvm'

Close #6231
PHP-CS-Fixer: restrict level to specified fixers
CS Fix
#6872 - reverting automated CS fix that introduced broken newline
#6872 - reverting automated CS fix that moved a comment after a brace
#6872 - reverting `if` block brace start, for readability
#6872 - reverting alignment: was overflowing 120 chars
Merge branch 'cs/#6872-php-cs-fixer-automated-fixes'

Close #6872
Forward port #6872