Merge branch '5.x' of github.com:craftcms/commerce into 5.x

Author: nfourtythree

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Fixed a bug where tax and shipping categories weren’t getting saved on the Edit variant screen. ([#4180](https://github.com/craftcms/commerce/issues/4180))
 - Fixed a bug where newly created variants weren’t visible on Edit product screens. 
 - Fixed a SQL error that could occur when viewing product indexes.
 - Fixed a PHP error that occurred when applying project config changes after updating. ([#4185](https://github.com/craftcms/commerce/issues/4185))

src/base/Purchasable.php

@@ -902,12 +902,22 @@ function($attribute, $params, Validator $validator) use ($lineItem, $lineItemQua
      */
     public function setAttributes($values, $safeOnly = true): void
     {
-        // Normalize empty strings to null for category IDs before setting
-        if (isset($values['taxCategoryId']) && $values['taxCategoryId'] === '') {
-            $values['taxCategoryId'] = null;
+        // Normalize category IDs - handle arrays from componentSelect and empty strings
+        if (isset($values['taxCategoryId'])) {
+            if (is_array($values['taxCategoryId'])) {
+                $values['taxCategoryId'] = reset($values['taxCategoryId']) ?: null;
+            }
+            if ($values['taxCategoryId'] === '') {
+                $values['taxCategoryId'] = null;
+            }
         }
-        if (isset($values['shippingCategoryId']) && $values['shippingCategoryId'] === '') {
-            $values['shippingCategoryId'] = null;
+        if (isset($values['shippingCategoryId'])) {
+            if (is_array($values['shippingCategoryId'])) {
+                $values['shippingCategoryId'] = reset($values['shippingCategoryId']) ?: null;
+            }
+            if ($values['shippingCategoryId'] === '') {
+                $values['shippingCategoryId'] = null;
+            }
         }
 
         parent::setAttributes($values, $safeOnly);