Merge remote-tracking branch 'origin/MC-33699-CE-2' into MC-33699

zakdma · zakdma · commit a38919ae2cd4 · 2020-05-04T11:13:09.000+03:00
diff --git a/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php b/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php
@@ -94,10 +94,10 @@ protected function reformatSwatchLabels($swatchStoreValue = null)
         }
         $newSwatch = [];
         foreach ($swatchStoreValue as $key => $value) {
-            if (is_string($value) && !empty($value)) {
-                if ($value[0] == '#') {
+            if (!empty($value) && is_string($value)) {
+                if ($value[0] === '#') {
                     $newSwatch[$key] = 'background: ' . $value;
-                } elseif ($value[0] == '/') {
+                } elseif ($value[0] === '/') {
                     $mediaUrl = $this->swatchHelper->getSwatchMediaUrl();
                     $newSwatch[$key] = 'background: url(' . $mediaUrl . $value . '); background-size: cover;';
                 }

Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,10 @@ protected function reformatSwatchLabels($swatchStoreValue = null)`
`94`	`94`	`}`
`95`	`95`	`$newSwatch = [];`
`96`	`96`	`foreach ($swatchStoreValue as $key => $value) {`
`97`		`- if (is_string($value) && !empty($value)) {`
`98`		`- if ($value[0] == '#') {`
	`97`	`+ if (!empty($value) && is_string($value)) {`
	`98`	`+ if ($value[0] === '#') {`
`99`	`99`	`$newSwatch[$key] = 'background: ' . $value;`
`100`		`- } elseif ($value[0] == '/') {`
	`100`	`+ } elseif ($value[0] === '/') {`
`101`	`101`	`$mediaUrl = $this->swatchHelper->getSwatchMediaUrl();`
`102`	`102`	`$newSwatch[$key] = 'background: url(' . $mediaUrl . $value . '); background-size: cover;';`
`103`	`103`	`}`