Fixes #316 : set return null for HydratingResultSet::current() on no …

…data
zendframework · Jul 3, 2018 · 06ab96b · 06ab96b
1 parent 58271ef
commit 06ab96b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/ResultSet/HydratingResultSet.php b/src/ResultSet/HydratingResultSet.php
@@ -90,7 +90,7 @@ public function getHydrator()
     /**
      * Iterator: get current item
      *
-     * @return object
+     * @return object|null
      */
     public function current()
     {
@@ -99,14 +99,14 @@ public function current()
         } elseif (is_array($this->buffer) && isset($this->buffer[$this->position])) {
             return $this->buffer[$this->position];
         }
-        $data = $this->dataSource->current();
-        $object = is_array($data) ? $this->hydrator->hydrate($data, clone $this->objectPrototype) : false;
+        $data    = $this->dataSource->current();
+        $current = is_array($data) ? $this->hydrator->hydrate($data, clone $this->objectPrototype) : null;
 
         if (is_array($this->buffer)) {
-            $this->buffer[$this->position] = $object;
+            $this->buffer[$this->position] = $current;
         }
 
-        return $object;
+        return $current;
     }
 
     /**

diff --git a/test/unit/ResultSet/HydratingResultSetTest.php b/test/unit/ResultSet/HydratingResultSetTest.php
@@ -56,7 +56,7 @@ public function testGetHydrator()
     /**
      * @covers \Zend\Db\ResultSet\HydratingResultSet::current
      */
-    public function testCurrent()
+    public function testCurrentHasData()
     {
         $hydratingRs = new HydratingResultSet;
         $hydratingRs->initialize([
@@ -66,6 +66,17 @@ public function testCurrent()
         self::assertInstanceOf('ArrayObject', $obj);
     }
 
+    /**
+     * @covers \Zend\Db\ResultSet\HydratingResultSet::current
+     */
+    public function testCurrentDoesnotHasData()
+    {
+        $hydratingRs = new HydratingResultSet;
+        $hydratingRs->initialize([]);
+        $result = $hydratingRs->current();
+        self::assertNull($result);
+    }
+
     /**
      * @covers \Zend\Db\ResultSet\HydratingResultSet::toArray
      * @todo   Implement testToArray().