MAGETWO-52011: Second error message is not displayed when adding product with two invalid file fields to the cart

Author: irenelagno

app/code/Magento/Catalog/Model/Product/Type/AbstractType.php

@@ -7,7 +7,7 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
-
+use Magento\Framework\Exception\LocalizedException;
 /**
  * @api
  * Abstract model for product type implementation
@@ -561,6 +561,7 @@ public function getSpecifyOptionMessage()
      * @param \Magento\Catalog\Model\Product $product
      * @param string $processMode
      * @return array
+     * @throws LocalizedException
      */
     protected function _prepareOptions(\Magento\Framework\DataObject $buyRequest, $product, $processMode)
     {
@@ -571,20 +572,29 @@ protected function _prepareOptions(\Magento\Framework\DataObject $buyRequest, $p
             $options = $product->getOptions();
         }
         if ($options !== null) {
+            $result = [];
             foreach ($options as $option) {
                 /* @var $option \Magento\Catalog\Model\Product\Option */
-                $group = $option->groupFactory($option->getType())
-                    ->setOption($option)
-                    ->setProduct($product)
-                    ->setRequest($buyRequest)
-                    ->setProcessMode($processMode)
-                    ->validateUserValue($buyRequest->getOptions());
+                try {
+                    $group = $option->groupFactory($option->getType())
+                        ->setOption($option)
+                        ->setProduct($product)
+                        ->setRequest($buyRequest)
+                        ->setProcessMode($processMode)
+                        ->validateUserValue($buyRequest->getOptions());
+                } catch (\Exception $e) {
+                    $result[] = $e->getMessage();
+                    continue;
+                }
 
                 $preparedValue = $group->prepareForCart();
                 if ($preparedValue !== null) {
                     $transport->options[$option->getId()] = $preparedValue;
                 }
             }
+            if (count($result) > 0) {
+                throw new LocalizedException(__(implode("\n", $result)));
+            }
         }
 
         $eventName = sprintf('catalog_product_type_prepare_%s_options', $processMode);