Permalink
Browse files

Post-PEAR cleanup, phase one: PHPUnit2_* -> PHPUnit_*, pear.php.net -…

…> phpunit.de, etc.
  • Loading branch information...
1 parent 8b8c705 commit 6b0d2d5a14b08c86c62c3888777b7f2b0c1aeff8 @sebastianbergmann committed Jun 29, 2006
Showing with 2,027 additions and 2,015 deletions.
  1. +6 −6 Extensions/ExceptionTestCase.php
  2. +6 −6 Extensions/MockObject/Builder/Identity.php
  3. +15 −15 Extensions/MockObject/Builder/InvocationMocker.php
  4. +7 −7 Extensions/MockObject/Builder/Match.php
  5. +9 −9 Extensions/MockObject/Builder/MethodNameMatch.php
  6. +10 −10 Extensions/MockObject/Builder/Namespace.php
  7. +11 −11 Extensions/MockObject/Builder/ParametersMatch.php
  8. +9 −9 Extensions/MockObject/Builder/Stub.php
  9. +8 −8 Extensions/MockObject/Invocation.php
  10. +19 −19 Extensions/MockObject/InvocationMocker.php
  11. +11 −11 Extensions/MockObject/Invokable.php
  12. +25 −25 Extensions/MockObject/Matcher.php
  13. +8 −8 Extensions/MockObject/Matcher/AnyParameters.php
  14. +12 −12 Extensions/MockObject/Matcher/Invocation.php
  15. +12 −12 Extensions/MockObject/Matcher/InvokedAtIndex.php
  16. +8 −8 Extensions/MockObject/Matcher/InvokedAtLeastOnce.php
  17. +13 −13 Extensions/MockObject/Matcher/InvokedCount.php
  18. +9 −9 Extensions/MockObject/Matcher/InvokedRecorder.php
  19. +11 −11 Extensions/MockObject/Matcher/MethodName.php
  20. +13 −13 Extensions/MockObject/Matcher/Parameters.php
  21. +8 −8 Extensions/MockObject/Matcher/StatelessInvocation.php
  22. +18 −18 Extensions/MockObject/Mock.php
  23. +14 −14 Extensions/MockObject/MockObject.php
  24. +11 −11 Extensions/MockObject/Stub.php
  25. +9 −9 Extensions/MockObject/Stub/ConsecutiveCalls.php
  26. +8 −8 Extensions/MockObject/Stub/MatcherCollection.php
  27. +8 −8 Extensions/MockObject/Stub/Return.php
  28. +6 −6 Extensions/MockObject/Verifiable.php
  29. +6 −6 Extensions/OutputTestCase.php
  30. +9 −9 Extensions/PerformanceTestCase.php
  31. +12 −12 Extensions/RepeatedTest.php
  32. +16 −16 Extensions/TestDecorator.php
  33. +11 −11 Extensions/TestSetup.php
  34. +21 −21 Framework.php
  35. +99 −97 Framework/Assert.php
  36. +7 −7 Framework/AssertionFailedError.php
  37. +23 −23 Framework/ComparisonFailure.php
  38. +7 −7 Framework/ComparisonFailure/Array.php
  39. +9 −9 Framework/ComparisonFailure/Object.php
  40. +6 −6 Framework/ComparisonFailure/Scalar.php
  41. +6 −6 Framework/ComparisonFailure/String.php
  42. +6 −6 Framework/ComparisonFailure/Type.php
  43. +24 −24 Framework/Constraint.php
  44. +9 −9 Framework/Constraint/And.php
  45. +8 −8 Framework/Constraint/ArrayHasKey.php
  46. +8 −8 Framework/Constraint/FileExists.php
  47. +9 −9 Framework/Constraint/GreaterThan.php
  48. +6 −6 Framework/Constraint/IsAnything.php
  49. +12 −12 Framework/Constraint/IsEqual.php
  50. +9 −9 Framework/Constraint/IsIdentical.php
  51. +9 −9 Framework/Constraint/IsInstanceOf.php
  52. +10 −10 Framework/Constraint/IsType.php
  53. +9 −9 Framework/Constraint/LessThan.php
  54. +9 −9 Framework/Constraint/Not.php
  55. +8 −8 Framework/Constraint/ObjectHasAttribute.php
  56. +10 −10 Framework/Constraint/Or.php
  57. +8 −8 Framework/Constraint/PCREMatch.php
  58. +8 −8 Framework/Constraint/StringContains.php
  59. +8 −8 Framework/Constraint/TraversableContains.php
  60. +6 −6 Framework/Error.php
  61. +9 −9 Framework/ExpectationFailedException.php
  62. +6 −6 Framework/IncompleteTest.php
  63. +8 −8 Framework/IncompleteTestError.php
  64. +6 −6 Framework/SelfDescribing.php
  65. +6 −6 Framework/SkippedTest.php
  66. +8 −8 Framework/SkippedTestError.php
  67. +12 −10 Framework/Test.php
  68. +35 −33 Framework/TestCase.php
  69. +11 −11 Framework/TestFailure.php
  70. +26 −24 Framework/TestListener.php
  71. +46 −46 Framework/TestResult.php
  72. +40 −38 Framework/TestSuite.php
  73. +7 −7 Framework/Warning.php
  74. +31 −31 Runner/BaseTestRunner.php
  75. +9 −9 Runner/IncludePathTestCollector.php
  76. +9 −9 Runner/StandardTestSuiteLoader.php
  77. +5 −5 Runner/TestCollector.php
  78. +5 −5 Runner/TestFilterIterator.php
  79. +5 −5 Runner/TestSuiteLoader.php
  80. +5 −5 Runner/Version.php
  81. +2 −2 Samples/BankAccount/BankAccount.php
  82. +4 −4 Samples/BankAccount/BankAccountTest.php
  83. +2 −2 Samples/Money/IMoney.php
  84. +2 −2 Samples/Money/Money.php
  85. +2 −2 Samples/Money/MoneyBag.php
  86. +4 −4 Samples/Money/MoneyTest.php
  87. +11 −11 Tests/AllTests.php
  88. +12 −12 Tests/Extensions/AllTests.php
  89. +4 −4 Tests/Extensions/ExceptionTestCaseTest.php
  90. +9 −9 Tests/Extensions/ExtensionTest.php
  91. +6 −6 Tests/Extensions/MockObjectTest.php
  92. +4 −4 Tests/Extensions/OutputTestCaseTest.php
  93. +6 −6 Tests/Extensions/PerformanceTestCaseTest.php
  94. +12 −12 Tests/Extensions/RepeatedTestTest.php
  95. +12 −12 Tests/Framework/AllTests.php
  96. +76 −76 Tests/Framework/AssertTest.php
  97. +13 −13 Tests/Framework/ComparisonFailureTest.php
  98. +16 −16 Tests/Framework/SuiteTest.php
  99. +10 −10 Tests/Framework/TestCaseTest.php
  100. +6 −6 Tests/Framework/TestImplementorTest.php
  101. +15 −15 Tests/Framework/TestListenerTest.php
  102. +12 −12 Tests/Runner/AllTests.php
  103. +4 −4 Tests/Runner/BaseTestRunnerTest.php
  104. +11 −11 Tests/Util/AllTests.php
  105. +11 −11 Tests/Util/TestDox/AllTests.php
  106. +6 −6 Tests/Util/TestDox/NamePrettifierTest.php
  107. +4 −4 Tests/_files/AnInterface.php
  108. +4 −4 Tests/_files/ClassWithNonPublicAttributes.php
  109. +8 −8 Tests/_files/DoubleTestCase.php
  110. +6 −6 Tests/_files/Error.php
  111. +6 −6 Tests/_files/Failure.php
  112. +4 −4 Tests/_files/InheritedTestCase.php
  113. +8 −8 Tests/_files/MockRunner.php
  114. +6 −6 Tests/_files/NoArgTestCaseTest.php
  115. +4 −4 Tests/_files/NoTestCaseClass.php
  116. +6 −6 Tests/_files/NoTestCases.php
  117. +4 −4 Tests/_files/NonStatic.php
  118. +6 −6 Tests/_files/NotPublicTestCase.php
  119. +6 −6 Tests/_files/NotVoidTestCase.php
  120. +6 −6 Tests/_files/OneTestCase.php
  121. +6 −6 Tests/_files/OutputTestCase.php
  122. +4 −4 Tests/_files/OverrideTestCase.php
  123. +4 −4 Tests/_files/SampleClass.php
  124. +4 −4 Tests/_files/SetupFailure.php
  125. +6 −6 Tests/_files/Sleep.php
  126. +6 −6 Tests/_files/Success.php
  127. +4 −4 Tests/_files/TearDownFailure.php
  128. +4 −4 Tests/_files/TestIterator.php
  129. +6 −6 Tests/_files/ThrowExceptionTestCase.php
  130. +6 −6 Tests/_files/ThrowNoExceptionTestCase.php
  131. +6 −6 Tests/_files/TornDown.php
  132. +6 −6 Tests/_files/TornDown2.php
  133. +4 −4 Tests/_files/TornDown3.php
  134. +4 −4 Tests/_files/TornDown4.php
  135. +4 −4 Tests/_files/TornDown5.php
  136. +4 −4 Tests/_files/TornDown6.php
  137. +6 −6 Tests/_files/WasRun.php
  138. +45 −45 TextUI/ResultPrinter.php
  139. +71 −69 TextUI/TestRunner.php
  140. +5 −5 Util/Array.php
  141. +7 −7 Util/ErrorHandler.php
  142. +5 −5 Util/Fileloader.php
  143. +5 −5 Util/Filesystem.php
  144. +4 −4 Util/Filter.php
  145. +5 −5 Util/Getopt.php
  146. +25 −25 Util/Log/Eclipse.php
  147. +32 −32 Util/Log/GraphViz.php
  148. +23 −23 Util/Log/PEAR.php
  149. +29 −29 Util/Log/TAP.php
  150. +31 −31 Util/Log/XML.php
  151. +5 −5 Util/Printer.php
  152. +12 −12 Util/Report.php
  153. +24 −24 Util/Report/Coverage/Factory.php
  154. +15 −15 Util/Report/Coverage/Node.php
  155. +27 −27 Util/Report/Coverage/Node/Directory.php
  156. +18 −18 Util/Report/Coverage/Node/File.php
  157. +23 −23 Util/Report/Test/Factory.php
  158. +15 −15 Util/Report/Test/Node.php
  159. +18 −18 Util/Report/Test/Node/Test.php
  160. +36 −36 Util/Report/Test/Node/TestSuite.php
  161. +8 −8 Util/Skeleton.php
  162. +10 −10 Util/Skeleton/TestClass.php
  163. +5 −5 Util/Template.php
  164. +14 −14 Util/Test.php
  165. +5 −5 Util/TestDox/NamePrettifier.php
  166. +30 −30 Util/TestDox/ResultPrinter.php
  167. +6 −6 Util/TestDox/ResultPrinter/HTML.php
  168. +6 −6 Util/TestDox/ResultPrinter/Text.php
  169. +5 −5 Util/Timer.php
  170. +21 −21 package.xml
  171. +1 −1 pear-phpunit
  172. +1 −1 pear-phpunit.bat
@@ -42,14 +42,14 @@
* @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version SVN: $Id$
- * @link http://pear.php.net/package/PHPUnit2
+ * @link http://www.phpunit.de/
* @since File available since Release 2.0.0
*/
-require_once 'PHPUnit2/Framework.php';
-require_once 'PHPUnit2/Util/Filter.php';
+require_once 'PHPUnit/Framework.php';
+require_once 'PHPUnit/Util/Filter.php';
-PHPUnit2_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
+PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
/**
* A TestCase that expects a specified Exception to be thrown.
@@ -60,10 +60,10 @@
* @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version Release: @package_version@
- * @link http://pear.php.net/package/PHPUnit2
+ * @link http://www.phpunit.de/
* @since Class available since Release 2.0.0
*/
-class PHPUnit2_Extensions_ExceptionTestCase extends PHPUnit2_Framework_TestCase
+class PHPUnit_Extensions_ExceptionTestCase extends PHPUnit_Framework_TestCase
{
/**
* The name of the expected Exception.
@@ -43,21 +43,21 @@
* @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version SVN: $Id$
- * @link http://pear.php.net/package/PHPUnit2
+ * @link http://www.phpunit.de/
* @since File available since Release 3.0.0
*/
-require_once 'PHPUnit2/Util/Filter.php';
+require_once 'PHPUnit/Util/Filter.php';
-PHPUnit2_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
+PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
/**
* Builder interface for unique identifiers.
*
* Defines the interface for recording unique identifiers. The identifiers
* can be used to define the invocation order of expectations. The expectation
* is recorded using id() and then defined in order using
- * PHPUnit2_Extensions_MockObject_Builder_Match::after().
+ * PHPUnit_Extensions_MockObject_Builder_Match::after().
*
* @category Testing
* @package PHPUnit2
@@ -66,10 +66,10 @@
* @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version Release: @package_version@
- * @link http://pear.php.net/package/PHPUnit2
+ * @link http://www.phpunit.de/
* @since Interface available since Release 3.0.0
*/
-interface PHPUnit2_Extensions_MockObject_Builder_Identity
+interface PHPUnit_Extensions_MockObject_Builder_Identity
{
/**
* Sets the identification of the expectation to $id.
@@ -43,24 +43,24 @@
* @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version SVN: $Id$
- * @link http://pear.php.net/package/PHPUnit2
+ * @link http://www.phpunit.de/
* @since File available since Release 3.0.0
*/
-require_once 'PHPUnit2/Util/Filter.php';
-require_once 'PHPUnit2/Extensions/MockObject/Builder/MethodNameMatch.php';
-require_once 'PHPUnit2/Extensions/MockObject/Matcher.php';
-require_once 'PHPUnit2/Extensions/MockObject/Stub.php';
+require_once 'PHPUnit/Util/Filter.php';
+require_once 'PHPUnit/Extensions/MockObject/Builder/MethodNameMatch.php';
+require_once 'PHPUnit/Extensions/MockObject/Matcher.php';
+require_once 'PHPUnit/Extensions/MockObject/Stub.php';
-PHPUnit2_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
+PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
/**
* Builder for mocked or stubbed invocations.
*
* Provides methods for building expectations without having to resort to
* instantiating the various matchers manually. These methods also form a
* more natural way of reading the expectation. This class should be together
- * with the test case PHPUnit2_Extensions_MockObject_TestCase.
+ * with the test case PHPUnit_Extensions_MockObject_TestCase.
*
* @category Testing
* @package PHPUnit2
@@ -69,19 +69,19 @@
* @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version Release: @package_version@
- * @link http://pear.php.net/package/PHPUnit2
+ * @link http://www.phpunit.de/
* @since Class available since Release 3.0.0
*/
-class PHPUnit2_Extensions_MockObject_Builder_InvocationMocker implements PHPUnit2_Extensions_MockObject_Builder_MethodNameMatch
+class PHPUnit_Extensions_MockObject_Builder_InvocationMocker implements PHPUnit_Extensions_MockObject_Builder_MethodNameMatch
{
private $collection;
private $matcher;
- public function __construct(PHPUnit2_Extensions_MockObject_Stub_MatcherCollection $collection, PHPUnit2_Extensions_MockObject_Matcher_Invocation $invocationMatcher)
+ public function __construct(PHPUnit_Extensions_MockObject_Stub_MatcherCollection $collection, PHPUnit_Extensions_MockObject_Matcher_Invocation $invocationMatcher)
{
$this->collection = $collection;
- $this->matcher = new PHPUnit2_Extensions_MockObject_Matcher($invocationMatcher);
+ $this->matcher = new PHPUnit_Extensions_MockObject_Matcher($invocationMatcher);
$this->collection->addMatcher($this->matcher);
}
@@ -98,7 +98,7 @@ public function id($id)
return $this;
}
- public function will(PHPUnit2_Extensions_MockObject_Stub $stub)
+ public function will(PHPUnit_Extensions_MockObject_Stub $stub)
{
$this->matcher->stub = $stub;
@@ -124,7 +124,7 @@ public function with()
throw new RuntimeException('Parameter matcher is already defined, cannot redefine');
}
- $this->matcher->parametersMatcher = new PHPUnit2_Extensions_MockObject_Matcher_Parameters($args);
+ $this->matcher->parametersMatcher = new PHPUnit_Extensions_MockObject_Matcher_Parameters($args);
return $this;
}
@@ -139,7 +139,7 @@ public function withAnyParameters()
throw new RuntimeException('Parameter matcher is already defined, cannot redefine');
}
- $this->matcher->parametersMatcher = new PHPUnit2_Extensions_MockObject_Matcher_AnyParameters();
+ $this->matcher->parametersMatcher = new PHPUnit_Extensions_MockObject_Matcher_AnyParameters();
return $this;
}
@@ -150,7 +150,7 @@ public function method($constraint)
throw new RuntimeException('Method name matcher is already defined, cannot redefine');
}
- $this->matcher->methodNameMatcher = new PHPUnit2_Extensions_MockObject_Matcher_MethodName($constraint);
+ $this->matcher->methodNameMatcher = new PHPUnit_Extensions_MockObject_Matcher_MethodName($constraint);
return $this;
}
@@ -43,14 +43,14 @@
* @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version SVN: $Id$
- * @link http://pear.php.net/package/PHPUnit2
+ * @link http://www.phpunit.de/
* @since File available since Release 3.0.0
*/
-require_once 'PHPUnit2/Util/Filter.php';
-require_once 'PHPUnit2/Extensions/MockObject/Builder/Stub.php';
+require_once 'PHPUnit/Util/Filter.php';
+require_once 'PHPUnit/Extensions/MockObject/Builder/Stub.php';
-PHPUnit2_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
+PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
/**
* Builder interface for invocation order matches.
@@ -62,17 +62,17 @@
* @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version Release: @package_version@
- * @link http://pear.php.net/package/PHPUnit2
+ * @link http://www.phpunit.de/
* @since Interface available since Release 3.0.0
*/
-interface PHPUnit2_Extensions_MockObject_Builder_Match extends PHPUnit2_Extensions_MockObject_Builder_Stub
+interface PHPUnit_Extensions_MockObject_Builder_Match extends PHPUnit_Extensions_MockObject_Builder_Stub
{
/**
* Defines the expectation which must occur before the current is valid.
*
* @param string $id The identification of the expectation that should
* occur before this one.
- * @return PHPUnit2_Extensions_MockObject_Builder_Stub
+ * @return PHPUnit_Extensions_MockObject_Builder_Stub
*/
public function after($id);
}
@@ -43,14 +43,14 @@
* @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version SVN: $Id$
- * @link http://pear.php.net/package/PHPUnit2
+ * @link http://www.phpunit.de/
* @since File available since Release 3.0.0
*/
-require_once 'PHPUnit2/Util/Filter.php';
-require_once 'PHPUnit2/Extensions/MockObject/Builder/ParametersMatch.php';
+require_once 'PHPUnit/Util/Filter.php';
+require_once 'PHPUnit/Extensions/MockObject/Builder/ParametersMatch.php';
-PHPUnit2_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
+PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
/**
* Builder interface for matcher of method names.
@@ -62,19 +62,19 @@
* @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version Release: @package_version@
- * @link http://pear.php.net/package/PHPUnit2
+ * @link http://www.phpunit.de/
* @since Interface available since Release 3.0.0
*/
-interface PHPUnit2_Extensions_MockObject_Builder_MethodNameMatch extends PHPUnit2_Extensions_MockObject_Builder_ParametersMatch
+interface PHPUnit_Extensions_MockObject_Builder_MethodNameMatch extends PHPUnit_Extensions_MockObject_Builder_ParametersMatch
{
/**
* Adds a new method name match and returns the parameter match object for
* further matching possibilities.
*
- * @param PHPUnit2_Framework_Constraint $name Constraint for matching method, if a
+ * @param PHPUnit_Framework_Constraint $name Constraint for matching method, if a
* string is passed it will use the
- * PHPUnit2_Framework_Constraint_IsEqual.
- * @return PHPUnit2_Extensions_MockObject_Builder_ParametersMatch
+ * PHPUnit_Framework_Constraint_IsEqual.
+ * @return PHPUnit_Extensions_MockObject_Builder_ParametersMatch
*/
public function method($name);
}
@@ -43,19 +43,19 @@
* @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version SVN: $Id$
- * @link http://pear.php.net/package/PHPUnit2
+ * @link http://www.phpunit.de/
* @since File available since Release 3.0.0
*/
-require_once 'PHPUnit2/Util/Filter.php';
-require_once 'PHPUnit2/Extensions/MockObject/Builder/Match.php';
+require_once 'PHPUnit/Util/Filter.php';
+require_once 'PHPUnit/Extensions/MockObject/Builder/Match.php';
-PHPUnit2_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
+PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
/**
* Interface for builders which can register builders with a given identification.
*
- * This interface relates to PHPUnit2_Extensions_MockObject_Builder_Identity.
+ * This interface relates to PHPUnit_Extensions_MockObject_Builder_Identity.
*
* @category Testing
* @package PHPUnit2
@@ -64,16 +64,16 @@
* @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version Release: @package_version@
- * @link http://pear.php.net/package/PHPUnit2
+ * @link http://www.phpunit.de/
* @since Interface available since Release 3.0.0
*/
-interface PHPUnit2_Extensions_MockObject_Builder_Namespace
+interface PHPUnit_Extensions_MockObject_Builder_Namespace
{
/**
* Looks up the match builder with identification $id and returns it.
*
* @param string $id The identifiction of the match builder.
- * @return PHPUnit2_Extensions_MockObject_Builder_Match
+ * @return PHPUnit_Extensions_MockObject_Builder_Match
*/
public function lookupId($id);
@@ -83,9 +83,9 @@ public function lookupId($id);
* has been invoked.
*
* @param string $id The identification of the match builder.
- * @param PHPUnit2_Extensions_MockObject_Builder_Match $builder The builder which is being registered.
+ * @param PHPUnit_Extensions_MockObject_Builder_Match $builder The builder which is being registered.
*/
- public function registerId($id, PHPUnit2_Extensions_MockObject_Builder_Match $builder);
+ public function registerId($id, PHPUnit_Extensions_MockObject_Builder_Match $builder);
}
/*
@@ -43,14 +43,14 @@
* @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version SVN: $Id$
- * @link http://pear.php.net/package/PHPUnit2
+ * @link http://www.phpunit.de/
* @since File available since Release 3.0.0
*/
-require_once 'PHPUnit2/Util/Filter.php';
-require_once 'PHPUnit2/Extensions/MockObject/Builder/Match.php';
+require_once 'PHPUnit/Util/Filter.php';
+require_once 'PHPUnit/Extensions/MockObject/Builder/Match.php';
-PHPUnit2_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
+PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
/**
* Builder interface for parameter matchers.
@@ -62,27 +62,27 @@
* @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version Release: @package_version@
- * @link http://pear.php.net/package/PHPUnit2
+ * @link http://www.phpunit.de/
* @since Interface available since Release 3.0.0
*/
-interface PHPUnit2_Extensions_MockObject_Builder_ParametersMatch extends PHPUnit2_Extensions_MockObject_Builder_Match
+interface PHPUnit_Extensions_MockObject_Builder_ParametersMatch extends PHPUnit_Extensions_MockObject_Builder_Match
{
/**
* Sets the parameters to match for, each parameter to this funtion will
* be part of match. To perform specific matches or constraints create a
- * new PHPUnit2_Framework_Constraint and use it for the parameter.
+ * new PHPUnit_Framework_Constraint and use it for the parameter.
* If the parameter value is not a constraint it will use the
- * PHPUnit2_Framework_Constraint_IsEqual for the value.
+ * PHPUnit_Framework_Constraint_IsEqual for the value.
*
* Some examples:
* <code>
* // match first parameter with value 2
* $b->with(2);
* // match first parameter with value 'smock' and second identical to 42
- * $b->with('smock', new PHPUnit2_Framework_Constraint_IsEqual(42));
+ * $b->with('smock', new PHPUnit_Framework_Constraint_IsEqual(42));
* </code>
*
- * @return PHPUnit2_Extensions_MockObject_Builder_ParametersMatch
+ * @return PHPUnit_Extensions_MockObject_Builder_ParametersMatch
*/
public function with();
@@ -95,7 +95,7 @@ public function with();
* $b->withAnyParamers();
* </code>
*
- * @return PHPUnit2_Extensions_MockObject_Matcher_AnyParameters
+ * @return PHPUnit_Extensions_MockObject_Matcher_AnyParameters
*/
public function withAnyParameters();
}
Oops, something went wrong.

0 comments on commit 6b0d2d5

Please sign in to comment.