Install phpUnit
Merge origin/master