Add php dependency to composer.json
Merge origin/master