Permalink
Browse files

- Merge [3438].

  • Loading branch information...
1 parent 69cfb06 commit 761a27a4836cf318419e128d62b62272383b4cca @sebastianbergmann committed Jul 12, 2008
@@ -81,10 +81,10 @@
public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation);
}
-require_once 'PHPUnit/Framework/MockObject/Stub/Callback.php';
require_once 'PHPUnit/Framework/MockObject/Stub/ConsecutiveCalls.php';
require_once 'PHPUnit/Framework/MockObject/Stub/Exception.php';
require_once 'PHPUnit/Framework/MockObject/Stub/MatcherCollection.php';
require_once 'PHPUnit/Framework/MockObject/Stub/Return.php';
require_once 'PHPUnit/Framework/MockObject/Stub/ReturnArgument.php';
+require_once 'PHPUnit/Framework/MockObject/Stub/ReturnCallback.php';
?>
@@ -62,7 +62,7 @@
* @link http://www.phpunit.de/
* @since Class available since Release 3.3.0
*/
-class PHPUnit_Framework_MockObject_Stub_Callback implements PHPUnit_Framework_MockObject_Stub
+class PHPUnit_Framework_MockObject_Stub_ReturnCallback implements PHPUnit_Framework_MockObject_Stub
{
protected $callback;
@@ -798,12 +798,12 @@ protected function returnArgument($argumentIndex)
*
*
* @param mixed $callback
- * @return PHPUnit_Framework_MockObject_Stub_Callback
+ * @return PHPUnit_Framework_MockObject_Stub_ReturnCallback
* @since Method available since Release 3.3.0
*/
protected function returnCallback($callback)
{
- return new PHPUnit_Framework_MockObject_Stub_Callback($callback);
+ return new PHPUnit_Framework_MockObject_Stub_ReturnCallback($callback);
}
/**
View
@@ -448,9 +448,6 @@
</file>
</dir>
<dir name="Stub">
- <file baseinstalldir="/" name="Callback.php" role="php">
- <tasks:replace from="@package_version@" to="version" type="package-info" />
- </file>
<file baseinstalldir="/" name="ConsecutiveCalls.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
@@ -466,6 +463,9 @@
<file baseinstalldir="/" name="ReturnArgument.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
+ <file baseinstalldir="/" name="ReturnCallback.php" role="php">
+ <tasks:replace from="@package_version@" to="version" type="package-info" />
+ </file>
</dir>
<file baseinstalldir="/" name="InvocationMocker.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />

0 comments on commit 761a27a

Please sign in to comment.