Result: fix return type of current()

nextras · Apr 13, 2020 · 7545696 · 7545696
1 parent 8330829
commit 7545696
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/Result/Result.php b/src/Result/Result.php
@@ -8,17 +8,22 @@
 
 namespace Nextras\Dbal\Result;
 
+use Countable;
 use DateTimeZone;
 use Nextras\Dbal\Drivers\IDriver;
 use Nextras\Dbal\Drivers\IResultAdapter;
 use Nextras\Dbal\InvalidArgumentException;
 use Nextras\Dbal\Utils\DateTimeImmutable;
+use SeekableIterator;
+use function assert;
+use function date_default_timezone_get;
+use function iterator_to_array;
 
 
 /**
- * @implements \SeekableIterator<int, Row>
+ * @implements SeekableIterator<int, Row>
  */
-class Result implements \SeekableIterator, \Countable
+class Result implements SeekableIterator, Countable
 {
 	/** @var IResultAdapter */
 	private $adapter;
@@ -243,8 +248,9 @@ public function key(): int
 	}
 
 
-	public function current(): ?Row
+	public function current(): Row
 	{
+		assert($this->iteratorRow !== null);
 		return $this->iteratorRow;
 	}
 

diff --git a/tests/cases/unit/ResultTest.phpt b/tests/cases/unit/ResultTest.phpt
@@ -41,7 +41,6 @@ class ResultTest extends TestCase
 		Assert::same(['First'], $names);
 
 		Assert::false($result->valid());
-		Assert::null($result->current());
 		Assert::same(1, $result->key());
 
 		$result->rewind();