Merge pull request #251 from bancer/patch-3

BitmaskedBehavior - do not set mapped field if it is not present in SELECT
dereuromark · Dec 23, 2019 · 52322c8 · 52322c8
2 parents 05739ab + 5019a4b
commit 52322c8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Model/Behavior/BitmaskedBehavior.php b/src/Model/Behavior/BitmaskedBehavior.php
@@ -140,8 +140,10 @@ public function beforeFind(Event $event, Query $query, ArrayObject $options, $pr
 
 			/** @var \Cake\Datasource\EntityInterface $entity */
 			$entity = $row;
-			$entity->set($mappedField, $this->decodeBitmask($entity->get($field)));
-			$entity->setDirty($mappedField, false);
+			if ($entity->has($field)) {
+				$entity->set($mappedField, $this->decodeBitmask($entity->get($field)));
+				$entity->setDirty($mappedField, false);
+			}
 			$mr->emit($entity);
 		};
 		$query->mapReduce($mapper);