Merge branch 'refs/heads/master' into 3.next-cake5

CakeDC · Apr 24, 2024 · 1bb8e46 · 1bb8e46
2 parents 9169b64 + 2bed5b5
commit 1bb8e46
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/Model/Behavior/Strategy/ConstStrategy.php b/src/Model/Behavior/Strategy/ConstStrategy.php
@@ -127,6 +127,10 @@ public function beforeFind(EventInterface $event, SelectQuery $query, ArrayObjec
             ->map(function (EntityInterface $row): EntityInterface {
                 $constant = Hash::get($row, $this->getConfig('field'));
 
+                if ($constant instanceof Entity) {
+                    return $row;
+                }
+
                 $field = Inflector::singularize(Inflector::underscore($this->alias));
                 $value = new Entity([
                     'label' => Hash::get($this->getConstants(), $constant, $constant),