Don't try to be smart in matches()
Instead, rely on verify() to do the hard work
HHVM on Travis CI is not recent enough

This reverts commit 5cd8f669925200bb7ad7cc7447bcf99ee04cc71a.
Merge branch '2.0'
Merge branch '1.2' of github.com:zwilias/phpunit-mock-objects