Merge "Fix PHP CodeSniffer warnings and errors"