[Upg] mockery 0.9 & phpunit 4.0.*
[Fix] merge conflict