Merge "Fix PHP CodeSniffer errors and warnings"