Simplify sorting logic and add clarifying comments

Co-authored-by: addison74 <8360474+addison74@users.noreply.github.com>

Author: Copilot

app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php

@@ -138,6 +138,9 @@ public function attachProductChildrenAttributeMapping(array $parentProducts, $st
             }
 
             if ($listSwatchValues !== []) {
+                // Preserve the sort order from $optionLabelsOriginal while maintaining the option IDs as keys.
+                // array_intersect_key returns entries from the first array that have matching keys in the second,
+                // which ensures we get the original (non-normalized) labels in the correct sort order.
                 $listSwatchValues = array_replace(
                     array_intersect_key($optionLabelsOriginal, $listSwatchValues),
                     $listSwatchValues,

app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Attribute/Super/Collection.php

@@ -124,21 +124,12 @@ protected function _getOptionLabels()
 
         $resultSet = $this->getConnection()->query($select);
         $labels = [];
-        $sortOrder = [];
         while ($option = $resultSet->fetch()) {
-            $optionId = $option['option_id'];
-            $labels[$optionId][$option['store_id']] = $option['label'];
-            // Track the order in which we see each option_id (already sorted by sort_order)
-            if (!isset($sortOrder[$optionId])) {
-                $sortOrder[$optionId] = count($sortOrder);
-            }
+            // PHP arrays maintain insertion order, so as we iterate through the sorted query results,
+            // the option IDs will be added in the correct sort_order
+            $labels[$option['option_id']][$option['store_id']] = $option['label'];
         }
 
-        // Sort the labels array by the order we encountered the option_ids
-        uksort($labels, function ($a, $b) use ($sortOrder) {
-            return ($sortOrder[$a] ?? PHP_INT_MAX) <=> ($sortOrder[$b] ?? PHP_INT_MAX);
-        });
-
         return $labels;
     }