Update ResultSet.php

Author: dezbyte

src/Colibri/Core/ResultSet/ResultSet.php

@@ -33,16 +33,36 @@ abstract class ResultSet extends \IteratorIterator implements \Countable
    */
   protected $hydrator;
 
+   /**
+   * @var string|integer
+   */
+  protected $currentKey;
+
   /**
    * @return mixed
    */
   public function current()
   {
     /** @var EntityInterface $entity */
-    $entity = $this->getReflection()->newInstance();
+    $reflection = $this->getReflection();
+    $entity = $reflection->newInstance();
     $hydrator = $this->getHydrator();
+    $metadata = $this->getMetadata();
+
+    $entity = $hydrator->hydrate(parent::current(), $entity);
 
-    return $hydrator->hydrate(parent::current(), $entity);
+    $identifier = $metadata->getName($metadata->getIdentifier(), Metadata::CAMILIZED);
+    $this->currentKey = $reflection->getProperty($identifier)->getValue($entity);
+
+    return $entity;
+  }
+
+  /**
+   * @return string|integer
+   */
+  public function key()
+  {
+    return $this->currentKey;
   }
 
   /**
@@ -157,4 +177,4 @@ public function count()
     return $this->getStatementIterator()->count();
   }
 
-}
+}