Permalink
Browse files

Closes #463.

  • Loading branch information...
sebastianbergmann committed Jan 19, 2012
1 parent 6acd28e commit 64788f353546cab933bfe04f8981f8a0ebbe9f50
Showing with 3 additions and 2 deletions.
  1. +1 −0 ChangeLog.markdown
  2. +2 −2 PHPUnit/Framework/TestCase.php
View
@@ -6,6 +6,7 @@ This is the list of changes for the PHPUnit 3.6 release series.
PHPUnit 3.6.8
-------------
+* Fixed #463: `PHPUnit_Framework_TestCase::testRequirements()` collides with actual test methods.
* Fixed reflection errors when `PHPUnit_Framework_Warning` is used.
* Marked `--skeleton-class` and `--skeleton-test` as deprecated. Please use the `phpunit-skelgen` tool that is provided by the `PHPUnit_SkeletonGenerator` package instead.
@@ -590,7 +590,7 @@ protected function setRequirementsFromAnnotation()
/**
* @since Method available since Release 3.6.0
*/
- protected function testRequirements()
+ protected function checkRequirements()
{
$this->setRequirementsFromAnnotation();
@@ -799,7 +799,7 @@ public function runBare()
$this->setExpectedExceptionFromAnnotation();
$this->setUp();
- $this->testRequirements();
+ $this->checkRequirements();
$this->assertPreConditions();
$this->testResult = $this->runTest();
$this->verifyMockObjects();

0 comments on commit 64788f3

Please sign in to comment.