mapper: fix accessing possibly uninitialized storage reflection [closes

#403]
nextras · Apr 13, 2020 · dd9d092 · dd9d092
1 parent 8ac61d4
commit dd9d092
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Mapper/Dbal/DbalMapper.php b/src/Mapper/Dbal/DbalMapper.php
@@ -332,11 +332,12 @@ protected function processMySQLAutoupdate(IEntity $entity, array $args)
 	{
 		assert($this instanceof IPersistAutoupdateMapper);
 		$this->connection->queryArgs($args);
+		$storageReflection = $this->getStorageReflection();
 
 		$primary = [];
 		$id = (array) ($entity->isPersisted() ? $entity->getPersistedId() : $this->connection->getLastInsertedId());
 		foreach ($entity->getMetadata()->getPrimaryKey() as $key) {
-			$key = $this->storageReflection->convertEntityToStorageKey($key);
+			$key = $storageReflection->convertEntityToStorageKey($key);
 			$primary[$key] = array_shift($id);
 		}
 
@@ -349,7 +350,7 @@ protected function processMySQLAutoupdate(IEntity $entity, array $args)
 		if ($row === null) {
 			$entity->onRefresh(null, true);
 		} else {
-			$data = $this->getStorageReflection()->convertStorageToEntity($row->toArray());
+			$data = $storageReflection->convertStorageToEntity($row->toArray());
 			$entity->onRefresh($data, true);
 		}
 	}
@@ -358,11 +359,12 @@ protected function processMySQLAutoupdate(IEntity $entity, array $args)
 	public function remove(IEntity $entity)
 	{
 		$this->beginTransaction();
+		$storageReflection = $this->getStorageReflection();
 
 		$primary = [];
 		$id = (array) $entity->getPersistedId();
 		foreach ($entity->getMetadata()->getPrimaryKey() as $key) {
-			$key = $this->storageReflection->convertEntityToStorageKey($key);
+			$key = $storageReflection->convertEntityToStorageKey($key);
 			$primary[$key] = array_shift($id);
 		}