Fix incorrect language on swatch error. Fix failed tests.

nmalevanec · nmalevanec · commit d159921f79c6 · 2018-08-23T11:21:57.000+03:00
diff --git a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
@@ -167,7 +167,8 @@ protected function convertSwatchToDropdown(Attribute $attribute)
             if (!empty($additionalData)) {
                 $additionalData = $this->serializer->unserialize($additionalData);
                 if (is_array($additionalData) && isset($additionalData[Swatch::SWATCH_INPUT_TYPE_KEY])) {
-                    $this->cleanEavAttributeOptionSwatchValues($attribute->getOption());
+                    $option = $attribute->getOption() ?: [];
+                    $this->cleanEavAttributeOptionSwatchValues($option);
                     unset($additionalData[Swatch::SWATCH_INPUT_TYPE_KEY]);
                     $attribute->setData('additional_data', $this->serializer->serialize($additionalData));
                 }
@@ -246,7 +247,8 @@ protected function saveSwatchParams(Attribute $attribute)
     {
         if ($this->swatchHelper->isVisualSwatch($attribute)) {
             $this->processVisualSwatch($attribute);
-            $this->cleanTextSwatchValuesAfterSwitch($attribute->getOptiontext());
+            $attributeOptions = $attribute->getOptiontext() ?: [];
+            $this->cleanTextSwatchValuesAfterSwitch($attributeOptions);
         } elseif ($this->swatchHelper->isTextSwatch($attribute)) {
             $this->processTextualSwatch($attribute);
         }
@@ -283,10 +285,10 @@ protected function processVisualSwatch(Attribute $attribute)
      * Clean swatch option values after switching to the dropdown type.
      *
      * @param array $attributeOptions
-     * @param null  $swatchType
+     * @param int|null  $swatchType
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    private function cleanEavAttributeOptionSwatchValues($attributeOptions, $swatchType = null)
+    private function cleanEavAttributeOptionSwatchValues(array $attributeOptions, int $swatchType = null)
     {
         if (count($attributeOptions) && isset($attributeOptions['value'])) {
             $optionsIDs = array_keys($attributeOptions['value']);
@@ -301,7 +303,7 @@ private function cleanEavAttributeOptionSwatchValues($attributeOptions, $swatchT
      * @param array $attributeOptions
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    private function cleanTextSwatchValuesAfterSwitch($attributeOptions)
+    private function cleanTextSwatchValuesAfterSwitch(array $attributeOptions)
     {
         $this->cleanEavAttributeOptionSwatchValues($attributeOptions, Swatch::SWATCH_TYPE_TEXTUAL);
     }
diff --git a/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php b/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
@@ -39,13 +39,13 @@ public function saveDefaultSwatchOption($id, $defaultValue)
     }
 
     /**
-     * Cleaned swatch option values when switching to dropdown input type
+     * Cleaned swatch option values when switching to dropdown input type.
      *
-     * @param $optionIDs
-     * @param $type
+     * @param array $optionIDs
+     * @param int $type
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function clearSwatchOptionByOptionIdAndType($optionIDs, $type = null)
+    public function clearSwatchOptionByOptionIdAndType(array $optionIDs, int $type = null)
     {
         if (count($optionIDs)) {
             foreach ($optionIDs as $optionId) {
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php
@@ -191,7 +191,7 @@ public function testBeforeSaveTextSwatch()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Admin is a required field in the each row
+     * @expectedExceptionMessage Admin is a required field in each row
      */
     public function testBeforeSaveWithFailedValidation()
     {
diff --git a/app/code/Magento/Swatches/i18n/en_US.csv b/app/code/Magento/Swatches/i18n/en_US.csv
@@ -1,4 +1,4 @@
-"Admin is a required field in the each row","Admin is a required field in the each row"
+"Admin is a required field in each row","Admin is a required field in each row"
 "Update Product Preview Image","Update Product Preview Image"
 "Filtering by this attribute will update the product image on catalog page","Filtering by this attribute will update the product image on catalog page"
 "Use Product Image for Swatch if Possible","Use Product Image for Swatch if Possible"
diff --git a/app/code/Magento/Ui/i18n/en_US.csv b/app/code/Magento/Ui/i18n/en_US.csv
@@ -180,7 +180,7 @@ CSV,CSV
 "Please enter a valid value from list","Please enter a valid value from list"
 "Please enter valid SKU key.","Please enter valid SKU key."
 "Please enter a valid number.","Please enter a valid number."
-"Admin is a required field in the each row.","Admin is a required field in the each row."
+"Admin is a required field in each row.","Admin is a required field in each row."
 "Please fix this field.","Please fix this field."
 "Please enter a valid date (ISO).","Please enter a valid date (ISO)."
 "Please enter only digits.","Please enter only digits."
diff --git a/lib/web/i18n/en_US.csv b/lib/web/i18n/en_US.csv
@@ -95,7 +95,7 @@ Submit,Submit
 "Please enter valid SKU key.","Please enter valid SKU key."
 "Please enter a valid number.","Please enter a valid number."
 "This is required field","This is required field"
-"Admin is a required field in the each row.","Admin is a required field in the each row."
+"Admin is a required field in each row.","Admin is a required field in each row."
 "Password cannot be the same as email address.","Password cannot be the same as email address."
 "Please fix this field.","Please fix this field."
 "Please enter a valid email address.","Please enter a valid email address."
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
@@ -1562,15 +1562,15 @@
         ],
         'required-text-swatch-entry': [
             tableSingleValidation,
-            $.mage.__('Admin is a required field in the each row.')
+            $.mage.__('Admin is a required field in each row.')
         ],
         'required-visual-swatch-entry': [
             tableSingleValidation,
-            $.mage.__('Admin is a required field in the each row.')
+            $.mage.__('Admin is a required field in each row.')
         ],
         'required-dropdown-attribute-entry': [
             tableSingleValidation,
-            $.mage.__('Admin is a required field in the each row.')
+            $.mage.__('Admin is a required field in each row.')
         ],
         'validate-item-quantity': [
             function (value, element, params) {

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,8 @@ protected function convertSwatchToDropdown(Attribute $attribute)`
`167`	`167`	`if (!empty($additionalData)) {`
`168`	`168`	`$additionalData = $this->serializer->unserialize($additionalData);`
`169`	`169`	`if (is_array($additionalData) && isset($additionalData[Swatch::SWATCH_INPUT_TYPE_KEY])) {`
`170`		`- $this->cleanEavAttributeOptionSwatchValues($attribute->getOption());`
	`170`	`+ $option = $attribute->getOption() ?: [];`
	`171`	`+ $this->cleanEavAttributeOptionSwatchValues($option);`
`171`	`172`	`unset($additionalData[Swatch::SWATCH_INPUT_TYPE_KEY]);`
`172`	`173`	`$attribute->setData('additional_data', $this->serializer->serialize($additionalData));`
`173`	`174`	`}`
`@@ -246,7 +247,8 @@ protected function saveSwatchParams(Attribute $attribute)`
`246`	`247`	`{`
`247`	`248`	`if ($this->swatchHelper->isVisualSwatch($attribute)) {`
`248`	`249`	`$this->processVisualSwatch($attribute);`
`249`		`- $this->cleanTextSwatchValuesAfterSwitch($attribute->getOptiontext());`
	`250`	`+ $attributeOptions = $attribute->getOptiontext() ?: [];`
	`251`	`+ $this->cleanTextSwatchValuesAfterSwitch($attributeOptions);`
`250`	`252`	`} elseif ($this->swatchHelper->isTextSwatch($attribute)) {`
`251`	`253`	`$this->processTextualSwatch($attribute);`
`252`	`254`	`}`
`@@ -283,10 +285,10 @@ protected function processVisualSwatch(Attribute $attribute)`
`283`	`285`	`* Clean swatch option values after switching to the dropdown type.`
`284`	`286`	`*`
`285`	`287`	`* @param array $attributeOptions`
`286`		`- * @param null $swatchType`
	`288`	`+ * @param int\|null $swatchType`
`287`	`289`	`* @throws \Magento\Framework\Exception\LocalizedException`
`288`	`290`	`*/`
`289`		`- private function cleanEavAttributeOptionSwatchValues($attributeOptions, $swatchType = null)`
	`291`	`+ private function cleanEavAttributeOptionSwatchValues(array $attributeOptions, int $swatchType = null)`
`290`	`292`	`{`
`291`	`293`	`if (count($attributeOptions) && isset($attributeOptions['value'])) {`
`292`	`294`	`$optionsIDs = array_keys($attributeOptions['value']);`
`@@ -301,7 +303,7 @@ private function cleanEavAttributeOptionSwatchValues($attributeOptions, $swatchT`
`301`	`303`	`* @param array $attributeOptions`
`302`	`304`	`* @throws \Magento\Framework\Exception\LocalizedException`
`303`	`305`	`*/`
`304`		`- private function cleanTextSwatchValuesAfterSwitch($attributeOptions)`
	`306`	`+ private function cleanTextSwatchValuesAfterSwitch(array $attributeOptions)`
`305`	`307`	`{`
`306`	`308`	`$this->cleanEavAttributeOptionSwatchValues($attributeOptions, Swatch::SWATCH_TYPE_TEXTUAL);`
`307`	`309`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,13 @@ public function saveDefaultSwatchOption($id, $defaultValue)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/**`
`42`		`- * Cleaned swatch option values when switching to dropdown input type`
	`42`	`+ * Cleaned swatch option values when switching to dropdown input type.`
`43`	`43`	`*`
`44`		`- * @param $optionIDs`
`45`		`- * @param $type`
	`44`	`+ * @param array $optionIDs`
	`45`	`+ * @param int $type`
`46`	`46`	`* @throws \Magento\Framework\Exception\LocalizedException`
`47`	`47`	`*/`
`48`		`- public function clearSwatchOptionByOptionIdAndType($optionIDs, $type = null)`
	`48`	`+ public function clearSwatchOptionByOptionIdAndType(array $optionIDs, int $type = null)`
`49`	`49`	`{`
`50`	`50`	`if (count($optionIDs)) {`
`51`	`51`	`foreach ($optionIDs as $optionId) {`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ public function testBeforeSaveTextSwatch()`
`191`	`191`
`192`	`192`	`/**`
`193`	`193`	`* @expectedException \Magento\Framework\Exception\InputException`
`194`		`- * @expectedExceptionMessage Admin is a required field in the each row`
	`194`	`+ * @expectedExceptionMessage Admin is a required field in each row`
`195`	`195`	`*/`
`196`	`196`	`public function testBeforeSaveWithFailedValidation()`
`197`	`197`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-"Admin is a required field in the each row","Admin is a required field in the each row"`
	`1`	`+"Admin is a required field in each row","Admin is a required field in each row"`
`2`	`2`	`"Update Product Preview Image","Update Product Preview Image"`
`3`	`3`	`"Filtering by this attribute will update the product image on catalog page","Filtering by this attribute will update the product image on catalog page"`
`4`	`4`	`"Use Product Image for Swatch if Possible","Use Product Image for Swatch if Possible"`