[Upg] mockery 0.9.0
[Fix] composer.json conflict
Merge branch '1.2'