MAGETWO-57153: [Backport] - [Github] Custom options not displayed correctly on a store view level magento#2908 magento#5885 - for 2.1

Author: OlgaVasyltsun

app/code/Magento/Catalog/Model/Product/Option/Repository.php

@@ -135,11 +135,9 @@ public function save(\Magento\Catalog\Api\Data\ProductCustomOptionInterface $opt
     {
         /** @var string $productSku */
         $productSku = $option->getProductSku();
-
         if (!$productSku) {
             throw new CouldNotSaveException(__('ProductSku should be specified'));
         }
-
         /** @var \Magento\Catalog\Model\Product $product */
         $product = $this->productRepository->get($productSku);
         /** @var \Magento\Framework\EntityManager\EntityMetadataInterface $metadata */
@@ -148,13 +146,10 @@ public function save(\Magento\Catalog\Api\Data\ProductCustomOptionInterface $opt
         $option->setData('store_id', $product->getStoreId());
 
         if ($option->getOptionId()) {
-
             $options = $product->getOptions();
-
             if (!$options) {
                 $options = $this->getProductOptions($product);
             }
-
             $persistedOption = array_filter(
                 $options,
                 function ($iOption) use ($option) {
@@ -171,7 +166,6 @@ function ($iOption) use ($option) {
             $originalValues = $persistedOption->getValues();
             /** @var array $newValues */
             $newValues = $option->getData('values');
-
             if ($newValues) {
                 $newValues = $this->markRemovedValues($newValues, $originalValues);
                 $option->setData('values', $newValues);

app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php

@@ -51,11 +51,9 @@ protected function validateOptionValue(Option $option)
             $storeId = $option->getProduct()->getStoreId();
         }
         foreach ($values as $value) {
-
             if (isset($value['is_delete']) && (bool)$value['is_delete']) {
                 continue;
             }
-
             $type = isset($value['price_type']) ? $value['price_type'] : null;
             $price = isset($value['price']) ? $value['price'] : null;
             $title = isset($value['title']) ? $value['title'] : null;

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php

@@ -197,7 +197,7 @@ public function testInitialize()
         $optionsData = [
             'option1' => ['is_delete' => true, 'name' => 'name1', 'price' => 'price1', 'option_id' => ''],
             'option2' => ['is_delete' => false, 'name' => 'name1', 'price' => 'price1', 'option_id' => '13'],
-            'option3' => ['is_delete' => false, 'name' => 'name1', 'price' => 'price1', 'option_id' => '14']
+            'option3' => ['is_delete' => false, 'name' => 'name1', 'price' => 'price1', 'option_id' => '14'],
         ];
         $productData = [
             'stock_data' => ['stock_data'],

app/code/Magento/Catalog/Test/Unit/Model/Product/Option/RepositoryTest.php

@@ -41,7 +41,7 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
      *
      * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $optionCollectionFactory;
+    private $optionCollectionFactory;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CustomOptionsTest.php

@@ -114,7 +114,8 @@ public function testModifyData()
                             CustomOptions::FIELD_TITLE_NAME => 'option1',
                             CustomOptions::FIELD_STORE_TITLE_NAME => 'Option Store Title',
                             CustomOptions::FIELD_IS_USE_DEFAULT => false
-                        ], [
+                        ],
+                        [
                             CustomOptions::FIELD_TITLE_NAME => 'option2',
                             CustomOptions::FIELD_STORE_TITLE_NAME => null,
                             CustomOptions::FIELD_IS_USE_DEFAULT => true,
@@ -123,7 +124,8 @@ public function testModifyData()
                                     CustomOptions::FIELD_TITLE_NAME => 'value1',
                                     CustomOptions::FIELD_STORE_TITLE_NAME => 'Option Value Store Title',
                                     CustomOptions::FIELD_IS_USE_DEFAULT => false
-                                ], [
+                                ],
+                                [
                                     CustomOptions::FIELD_TITLE_NAME => 'value2',
                                     CustomOptions::FIELD_STORE_TITLE_NAME => null,
                                     CustomOptions::FIELD_IS_USE_DEFAULT => true

dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php

@@ -41,7 +41,7 @@
                 'title' => 'Option 1 & Value 3"',
                 'price' => '3.00',
                 'price_type' => 'fixed'
-            ]
+            ],
         ]
     ],
     [