Merge forwardport of #13101 to 2.3-develop branch

magento-engcom-team · web-flow · commit ded8aa9710c5 · 2018-01-24T21:26:44.000+03:00
Applied pull request patch https://github.com/magento/magento2/pull/13101.patch (created by @chris-pook) based on commit(s): 1. ee5fc2e Fixed GitHub Issues in 2.3-develop branch: - #11828: Visual Swatches not showing swatch color in admin (reported by @lee586)
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
@@ -84,15 +84,15 @@ public function getJsonConfig()
      * Parse swatch labels for template
      *
      * @codeCoverageIgnore
-     * @param null $swatchStoreValue
-     * @return string
+     * @param null|array $swatchStoreValue
+     * @return null|array
      */
     protected function reformatSwatchLabels($swatchStoreValue = null)
     {
         if ($swatchStoreValue === null) {
             return;
         }
-        $newSwatch = '';
+        $newSwatch = [];
         foreach ($swatchStoreValue as $key => $value) {
             if ($value[0] == '#') {
                 $newSwatch[$key] = 'background: '.$value;

Original file line number	Diff line number	Diff line change
`@@ -84,15 +84,15 @@ public function getJsonConfig()`
`84`	`84`	`* Parse swatch labels for template`
`85`	`85`	`*`
`86`	`86`	`* @codeCoverageIgnore`
`87`		`- * @param null $swatchStoreValue`
`88`		`- * @return string`
	`87`	`+ * @param null\|array $swatchStoreValue`
	`88`	`+ * @return null\|array`
`89`	`89`	`*/`
`90`	`90`	`protected function reformatSwatchLabels($swatchStoreValue = null)`
`91`	`91`	`{`
`92`	`92`	`if ($swatchStoreValue === null) {`
`93`	`93`	`return;`
`94`	`94`	`}`
`95`		`- $newSwatch = '';`
	`95`	`+ $newSwatch = [];`
`96`	`96`	`foreach ($swatchStoreValue as $key => $value) {`
`97`	`97`	`if ($value[0] == '#') {`
`98`	`98`	`$newSwatch[$key] = 'background: '.$value;`