Merge "phpcs: Fix Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore violations"