merge phptal to ci