Merge "Fix remaining php sniffs"