Merge "Fix php code style"