add php-diff
Merge remote-tracking branch 'upstream/master'

merge with xiaochai