psr12 fixes for new PHP_CodeSniffer (#4795)