Merge branch 'develop' of github.com:magento/magento2ce into MPI-bugfixes

Author: Dmytro Yushkin

app/code/Magento/CatalogImportExport/Model/Export/Product.php

@@ -1284,6 +1284,14 @@ protected function getCustomOptionsData($productIds)
                     $row['max_characters'] = $option['max_characters'];
                 }
 
+                foreach (['file_extension', 'image_size_x', 'image_size_y'] as $fileOptionKey) {
+                    if (!isset($option[$fileOptionKey])) {
+                        continue;
+                    }
+
+                    $row[$fileOptionKey] = $option[$fileOptionKey];
+                }
+
                 $values = $option->getValues();
 
                 if ($values) {

app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php

@@ -105,6 +105,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         'radio' => true,
         'checkbox' => true,
         'multiple' => true,
+        'file' => ['sku', 'file_extension', 'image_size_x', 'image_size_y'],
     ];
 
     /**
@@ -1136,6 +1137,28 @@ private function processOptionRow($name, $optionRow)
             $result[$this->columnMaxCharacters] = $optionRow['max_characters'];
         }
 
+        $result = $this->addFileOptions($result, $optionRow);
+
+        return $result;
+    }
+
+    /**
+     * Add file options
+     *
+     * @param array $result
+     * @param array $optionRow
+     * @return array
+     */
+    private function addFileOptions($result, $optionRow)
+    {
+        foreach (['file_extension', 'image_size_x', 'image_size_y'] as $fileOptionKey) {
+            if (!isset($optionRow[$fileOptionKey])) {
+                continue;
+            }
+
+            $result[self::COLUMN_PREFIX . $fileOptionKey] = $optionRow[$fileOptionKey];
+        }
+
         return $result;
     }
 

composer.lock

@@ -1,6 +1,6 @@
 {
     "require": {
-        "magento/mtf": "1.0.0-rc46",
+        "magento/mtf": "1.0.0-rc47",
         "php": "~5.6.0|7.0.2|~7.0.6",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2"

dev/tests/functional/composer.json

@@ -30,7 +30,6 @@ class ExpireAdminSessionTest extends Injectable
 {
     /* tags */
     const MVP = 'no';
-    const DOMAIN = 'PS';
     /* end tags */
 
     protected $systemConfigEdit;