Skip to content

Commit

Permalink
Merge branch 'prepare-0.9.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
davedevelopment committed Dec 22, 2014
2 parents 4055c0e + 4814678 commit 686f85f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
@@ -1,6 +1,8 @@
# Change Log

## 0.9.3 (XXXX-XX-XX)
## 0.9.4 (XXXX-XX-XX)

## 0.9.3 (2014-12-22)

* Added a basic spy implementation
* Added `Mockery\Adapter\Phpunit\MockeryTestCase` for more reliable PHPUnit
Expand Down
7 changes: 0 additions & 7 deletions library/Mockery/Mock.php
Expand Up @@ -32,13 +32,6 @@ class Mock implements MockInterface
*/
protected $_mockery_expectations = array();

/**
* Last expectation that was set
*
* @var object
*/
protected $_mockery_lastExpectation = null;

/**
* Flag to indicate whether we can ignore method calls missing from our
* expectations
Expand Down

0 comments on commit 686f85f

Please sign in to comment.