Merge "phpcs: Fix WhiteSpace.LanguageConstructSpacing warnings"