Remove FunctionResultSet::getClass()

emonkak · Jun 19, 2020 · e57ef26 · e57ef26
1 parent d7439be
commit e57ef26
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 31 deletions.
diff --git a/src/Fetcher/FunctionFetcher.php b/src/Fetcher/FunctionFetcher.php
@@ -10,7 +10,7 @@
 use Emonkak\Orm\ResultSet\ResultSetInterface;
 
 /**
- * @template T of object
+ * @template T
  * @implements FetcherInterface<T>
  */
 class FunctionFetcher implements FetcherInterface
@@ -26,8 +26,8 @@ class FunctionFetcher implements FetcherInterface
     private $pdo;
 
     /**
-     * @psalm-var class-string<T>
-     * @var callable
+     * @psalm-var ?class-string<T>
+     * @var ?string
      */
     private $class;
 
@@ -59,10 +59,10 @@ function(array $props) use ($class) {
     }
 
     /**
-     * @psalm-param class-string<T> $class
+     * @psalm-param ?class-string<T> $class
      * @psalm-param callable(array<string,mixed>):T $instantiator
      */
-    public function __construct(PDOInterface $pdo, string $class, callable $instantiator)
+    public function __construct(PDOInterface $pdo, ?string $class, callable $instantiator)
     {
         $this->pdo = $pdo;
         $this->class = $class;
@@ -96,6 +96,6 @@ public function getInstantiator(): callable
     public function fetch(QueryBuilderInterface $queryBuilder): ResultSetInterface
     {
         $stmt = $queryBuilder->prepare($this->pdo);
-        return new FunctionResultSet($stmt, $this->class, $this->instantiator);
+        return new FunctionResultSet($stmt, $this->instantiator);
     }
 }
diff --git a/src/ResultSet/FunctionResultSet.php b/src/ResultSet/FunctionResultSet.php
@@ -23,37 +23,21 @@ class FunctionResultSet implements \IteratorAggregate, ResultSetInterface
      */
     private $stmt;
 
-    /**
-     * @psalm-var ?class-string<T>
-     * @var ?class-string
-     */
-    private $class;
-
     /**
      * @psalm-var callable(array<string,mixed>):T
      * @var callable
      */
     private $instantiator;
 
     /**
-     * @psalm-param ?class-string<T> $class
      * @psalm-param callable(array<string,mixed>):T $instantiator
      */
-    public function __construct(PDOStatementInterface $stmt, ?string $class, callable $instantiator)
+    public function __construct(PDOStatementInterface $stmt, callable $instantiator)
     {
         $this->stmt = $stmt;
-        $this->class = $class;
         $this->instantiator = $instantiator;
     }
 
-    /**
-     * @psalm-return ?class-string<T>
-     */
-    public function getClass(): ?string
-    {
-        return $this->class;
-    }
-
     /**
      * @psalm-return callable(array<string,mixed>):T
      */

diff --git a/tests/Fetcher/FunctionFetcherTest.php b/tests/Fetcher/FunctionFetcherTest.php
@@ -61,7 +61,6 @@ public function testFetch(): void
         $result = $fetcher->fetch($queryBuilder);
 
         $this->assertInstanceOf(FunctionResultSet::class, $result);
-        $this->assertEquals($class, $result->getClass());
         $this->assertEquals($instantiator, $result->getInstantiator());
     }
 }
diff --git a/tests/ResultSet/FunctionResultSetTest.php b/tests/ResultSet/FunctionResultSetTest.php
@@ -21,16 +21,10 @@ class FunctionResultSetTest extends TestCase
     public function setUp(): void
     {
         $this->stmt = $this->createMock(IterablePDOStatementInterface::class);
-        $this->class = Model::class;
         $this->instantiator = function($props) {
             return new Model($props);
         };
-        $this->result = new FunctionResultSet($this->stmt, $this->class, $this->instantiator);
-    }
-
-    public function testGetClass(): void
-    {
-        $this->assertSame($this->class, $this->result->getClass());
+        $this->result = new FunctionResultSet($this->stmt, $this->instantiator);
     }
 
     public function testGetInstantiator(): void