Merge remote-tracking branch 'origin/imported-magento-magento2-31093' into 2.4-develop-pr113

Author: zakdma

app/code/Magento/Catalog/Model/Product/Option/Type/File.php

@@ -228,7 +228,10 @@ public function validateUserValue($values)
          * previous configuration with no newly uploaded file
          */
         $fileInfo = null;
-        if (isset($values[$option->getId()]) && is_array($values[$option->getId()])) {
+        if (isset($values[$option->getId()])) {
+            if (is_string($values[$option->getId()])) {
+                $values[$option->getId()] = explode(',', $values[$option->getId()]);
+            }
             // Legacy style, file info comes in array with option id index
             $fileInfo = $values[$option->getId()];
         } else {

dev/tests/integration/testsuite/Magento/Checkout/_files/customer_quote_with_items_simple_product_options.php

@@ -67,7 +67,7 @@
             $iDate++;
             break;
         case ProductCustomOptionInterface::OPTION_GROUP_FILE:
-            $value = 'test.jpg';
+            $value = null;
             break;
         default:
             $value = 'test';