Fixed PHP error when eager loading variant owner

craftcms · Dec 17, 2024 · 5eacab1 · 5eacab1
1 parent d2440a2
commit 5eacab1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Craft Commerce
 
+## Unreleased
+
+- Fixed a PHP error when eager loading a variant’s owner. ([#3817](https://github.com/craftcms/commerce/issues/3817))
+
 ## 5.2.9.1 - 2024-12-13
 
 - Fixed a bug where line item promotional prices weren’t updated when upgrading to Commerce 5.

diff --git a/src/elements/Variant.php b/src/elements/Variant.php
@@ -887,7 +887,7 @@ public static function hasStatuses(): bool
      */
     public static function eagerLoadingMap(array $sourceElements, string $handle): array|null|false
     {
-        if ($handle == 'product') {
+        if (in_array($handle, ['product', 'owner', 'primaryOwner'])) {
             // Get the source element IDs
             $sourceElementIds = [];
 
@@ -1093,10 +1093,14 @@ public function afterSave(bool $isNew): void
      */
     public function setEagerLoadedElements(string $handle, array $elements, EagerLoadPlan $plan): void
     {
-        if ($handle == 'product') {
+        if (in_array($handle, ['product', 'owner', 'primaryOwner'])) {
             $product = $elements[0] ?? null;
             if ($product instanceof Product) {
-                $this->setOwner($product);
+                if ($handle == 'primaryOwner') {
+                    $this->setPrimaryOwner($product);
+                } else {
+                    $this->setOwner($product);
+                }
             }
         } else {
             $this->traitSetEagerLoadedElements($handle, $elements, $plan);