Skip to content

Commit

Permalink
Merge branch '8.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed Sep 7, 2019
2 parents f2d371f + 47be683 commit 3c4c524
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion src/Framework/TestSuiteIterator.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function key(): int
/**
* Returns the current element.
*/
public function current(): Test
public function current(): ?Test
{
return $this->valid() ? $this->tests[$this->position] : null;
}
Expand Down
4 changes: 0 additions & 4 deletions tests/unit/Framework/TestSuiteIteratorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ public function testValidForEmptyTestSuiteInitiallyReturnsFalse(): void

public function testCurrentForEmptyTestSuiteInitiallyReturnsNull(): void
{
$this->markTestSkipped('This test needs a bug fix to pass.');

$testSuite = new TestSuite();
$subject = new TestSuiteIterator($testSuite);

Expand Down Expand Up @@ -123,8 +121,6 @@ public function testNextIncreasesKeyFromZeroToOne(): void

public function testCurrentAfterLastElementReturnsNull(): void
{
$this->markTestSkipped('This test needs a bug fix to pass.');

$testSuite = new TestSuite();
$testSuite->addTest(new \EmptyTestCaseTest());
$subject = new TestSuiteIterator($testSuite);
Expand Down

0 comments on commit 3c4c524

Please sign in to comment.