Fix typo

Author: Marco Bunge

src/AbstractMapper.php

@@ -37,6 +37,11 @@ abstract class AbstractMapper implements Mapper
      */
     protected $primaryKey;
 
+    /**
+     * @var string
+     */
+    protected $autoIncrementKey;
+
     /**
      * @var Column[]
      */
@@ -47,11 +52,6 @@ abstract class AbstractMapper implements Mapper
      */
     private $hydrator;
 
-    /**
-     * @var string
-     */
-    protected $lastInsertIdReference;
-
     /**
      * @var IdentityMap
      */
@@ -157,9 +157,9 @@ final public function getPrimaryKey()
     /**
      * @return string
      */
-    final public function getLastInsertIdReference()
+    final public function getAutoIncrementKey()
     {
-        return $this->lastInsertIdReference;
+        return $this->autoIncrementKey;
     }
 
     /**
@@ -240,9 +240,9 @@ public function isNew($dataOrEntity)
     public function find($primaryKey = [])
     {
         // load entity from cache
-        if(isset($primaryKey[$this->getLastInsertIdReference()])){
-            if($this->getIdentityMap()->hasId($primaryKey[$this->getLastInsertIdReference()])){
-                return $this->getIdentityMap()->getObject($primaryKey[$this->getLastInsertIdReference()]);
+        if(isset($primaryKey[$this->getAutoIncrementKey()])){
+            if($this->getIdentityMap()->hasId($primaryKey[$this->getAutoIncrementKey()])){
+                return $this->getIdentityMap()->getObject($primaryKey[$this->getAutoIncrementKey()]);
             }
         }
 
@@ -298,9 +298,9 @@ public function select(callable $queryCallback, $fields = ['*'], $one = false)
             $entity = null;
             // fetch entity from identity map
             // keeping object id
-            if(isset($record[$this->getLastInsertIdReference()])){
-                if($identityMap->hasId($record[$this->getLastInsertIdReference()])){
-                    $entity = $identityMap->getObject($record[$this->getLastInsertIdReference()]);
+            if(isset($record[$this->getAutoIncrementKey()])){
+                if($identityMap->hasId($record[$this->getAutoIncrementKey()])){
+                    $entity = $identityMap->getObject($record[$this->getAutoIncrementKey()]);
                 }
             }
 
@@ -344,7 +344,7 @@ public function delete($entity)
 
         $result = $query->execute();
 
-        $this->getIdentityMap()->remove($data[$this->getLastInsertIdReference()], $entity);
+        $this->getIdentityMap()->remove($data[$this->getAutoIncrementKey()], $entity);
 
         return $result;
     }
@@ -368,12 +368,12 @@ public function create($entity)
         $query->execute();
 
         //inject auto increment key
-        if (null !== $this->getLastInsertIdReference()) {
-            $data[$this->getLastInsertIdReference()] = $this->connection->lastInsertId();
+        if (null !== $this->getAutoIncrementKey()) {
+            $data[$this->getAutoIncrementKey()] = $this->connection->lastInsertId();
             $entity = $this->map($data, $entity);
 
             // add identity
-            $this->getIdentityMap()->set($data[$this->getLastInsertIdReference()], $entity);
+            $this->getIdentityMap()->set($data[$this->getAutoIncrementKey()], $entity);
         }
 
         return $entity;
@@ -414,7 +414,7 @@ public function update($entity)
         $query->execute();
 
         // update identity
-        $this->getIdentityMap()->set($data[$this->getLastInsertIdReference()], $entity);
+        $this->getIdentityMap()->set($data[$this->getAutoIncrementKey()], $entity);
 
         // we don't need to update entity data
         return $entity;
@@ -530,8 +530,8 @@ private function doDefine()
         reset($primaryKey);
 
         // sanitize and validate last insert id reference which is a subset of primary key
-        if (0 < count($this->primaryKey) && null === $this->lastInsertIdReference) {
-            $this->lastInsertIdReference = current($primaryKey);
+        if (0 < count($this->primaryKey) && null === $this->autoIncrementKey) {
+            $this->autoIncrementKey = current($primaryKey);
         }
 
         //sanitize and validate columns

src/Mapper.php

@@ -54,7 +54,7 @@ public function getColumns();
     /**
      * @return string
      */
-    public function getLastInsertIdReference();
+    public function getAutoIncrementKey();
 
     /**
      * @return Gateway

src/UnitOfWork.php

@@ -117,8 +117,8 @@ public function update($object)
         $mapper = $this->connection->loadMapper($object);
         $data = $mapper->getHydrator()->extract($object);
 
-        if (isset($data[$mapper->getLastInsertIdReference()])) {
-            $mapper->getIdentityMap()->set($data[$mapper->getLastInsertIdReference()], $object);
+        if (isset($data[$mapper->getAutoIncrementKey()])) {
+            $mapper->getIdentityMap()->set($data[$mapper->getAutoIncrementKey()], $object);
         }
 
         $this->updatedObjects[spl_object_hash($object)] = $object;
@@ -161,8 +161,8 @@ public function delete($object)
         $mapper = $this->connection->loadMapper($object);
         $data = $mapper->getHydrator()->extract($object);
 
-        if (isset($data[$mapper->getLastInsertIdReference()])) {
-            $mapper->getIdentityMap()->remove($data[$mapper->getLastInsertIdReference()], $object);
+        if (isset($data[$mapper->getAutoIncrementKey()])) {
+            $mapper->getIdentityMap()->remove($data[$mapper->getAutoIncrementKey()], $object);
         }
 
         $this->deletedObjects[spl_object_hash($object)] = $object;

tests/IntegrationTest.php

@@ -60,7 +60,7 @@ public function testMapperIntegration()
         $this->assertEquals('post', $mapper->getTableName());
         $this->assertArrayHasKey('id', $mapper->getColumns());
         $this->assertArrayHasKey('content', $mapper->getColumns());
-        $this->assertEquals('id', $mapper->getLastInsertIdReference());
+        $this->assertEquals('id', $mapper->getAutoIncrementKey());
 
         $entity->setContent('cnt');
         $this->assertEquals(null, $entity->getId());