Add feature file for inline matcher no arguments
Add feature file for inline matcher with arguments
Examples for scalara matchers maching php natives
Add a few more examples and clarify example
Rename  to , clearer
Remove array match example
Remove is null matcher
Remove both array and null matchers - hhvm doesn't like them :|
Remove callable matcher
Remove object matcher
Re-add callable matcher
Fix state matcher throwing method not found under hhvm for closures

This patch fixes state matcher by checking if the subject is
a callable. Under hhvm, callables will pass the first condition
of support for state matcher, which causes the matcher to
attempt to call an isCallable method on the callable itself.

This is not the wanted behaviour, the beCallable should be picked
up for support by the scalar matcher, and this is not
happening because is_object returns true in the state matcher
under hhvm. With this patch this is no longer the case
and phpspec will work as expected under hhvm.
Merge pull request #327 from whisller/hotfix/fix-state-matcher-under-hhvm

Fix state matcher throwing method not found under hhvm for closures
Merge pull request #323 from MarcelloDuarte/behat-features-matcher-inline

Behat features matcher inline
Merge branch 'master' of github.com:phpspec/phpspec into feature/behat-features-matchers-scalar
Merge pull request #322 from jon-acker/feature/behat-features-matchers-scalar

Examples for scalar matchers matching php natives
Update change log
Fix autoload bug. Fixes #373.
bug #374 Fix autoload bug. Fixes #373. (mdavis1982)

This PR was submitted for the develop branch but it was merged into the 2.1.x-dev branch instead (closes #374).

Discussion
----------

Fix autoload bug. Fixes #373.

Related to issue #373, This fixes the problem whereby locating the `autoload.php` in a non-standard composer install (using the `vendor-dir`option) fails.

Commits
-------

8c27c39 Fix autoload bug. Fixes #373.
Fixed the version reported by PhpSpec in the dev version