Merge [3438].

sebastianbergmann · Jul 12, 2008 · ea83421 · ea83421
1 parent 8dd02b6
commit ea83421
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/PHPUnit/Framework/MockObject/Stub.php b/PHPUnit/Framework/MockObject/Stub.php
@@ -81,10 +81,10 @@ interface PHPUnit_Framework_MockObject_Stub extends PHPUnit_Framework_SelfDescri
     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';
 ?>
diff --git a/...it/Framework/MockObject/Stub/Callback.php → ...mework/MockObject/Stub/ReturnCallback.php b/...it/Framework/MockObject/Stub/Callback.php → ...mework/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;
 

diff --git a/PHPUnit/Framework/TestCase.php b/PHPUnit/Framework/TestCase.php
@@ -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);
     }
 
     /**

diff --git a/package.xml b/package.xml
@@ -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" />