Add PHPDoc type hint to fix PHPStorm inspection error
Merge pull request #18 from rowanhill/phpstormfix

Add PHPDoc type hint to fix PHPStorm inspection error
Add phpdoc annotations for when action methods to help IDEs
More informative error messages when stubbing
Merge pull request #20 from rowanhill/thenerror-squash

More informative error messages when stubbing
Merge pull request #19 from rowanhill/completion-squash

Add phpdoc annotations for when action methods to help IDEs
Merge branch 'master' of https://github.com/hafriedlander/phockito

Conflicts:
	Phockito.php
	Phockito_Globals.php
Merge branch 'master' of https://github.com/hafriedlander/phockito

Conflicts:
	Phockito.php
	Phockito_Globals.php