Merge pull request #4963 from magento-tsg/2.2.11-develop-pr120

zakdma · web-flow · commit eb91c20ed85a · 2019-11-04T16:42:22.000+02:00
[TSG] Fixes for 2.2 (pr120) (2.2.11-develop)
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php
@@ -188,6 +188,7 @@ protected function getFieldsForFieldset()
                             'componentType' => Form\Field::NAME,
                             'formElement' => Form\Element\Checkbox::NAME,
                             'description' => __($website['name']),
+                            '__disableTmpl' => true,
                             'tooltip' => $tooltip,
                             'sortOrder' => $sortOrder,
                             'dataScope' => 'website_ids.' . $website['id'],
@@ -353,18 +354,21 @@ protected function getWebsitesOptionsList()
             $websiteOption = [
                 'value' => '0.' . $website['id'],
                 'label' => __($website['name']),
+                '__disableTmpl' => true,
             ];
             $groupOptions = [];
             foreach ($website['groups'] as $group) {
                 $groupOption = [
                     'value' => '0.' . $website['id'] . '.' . $group['id'],
                     'label' => __($group['name']),
+                    '__disableTmpl' => true,
                 ];
                 $storeViewOptions = [];
                 foreach ($group['stores'] as $storeView) {
                     $storeViewOptions[] = [
                         'value' => $storeView['id'],
                         'label' => __($storeView['name']),
+                        '__disableTmpl' => true,
                     ];
                 }
                 if (!empty($storeViewOptions)) {
diff --git a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/Cms/OptionsTest.php b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/Cms/OptionsTest.php
@@ -71,7 +71,7 @@ public function testToOptionArray()
         $expectedOptions = [
             [
                 'label' => __('All Store Views'),
-                'value' => '0'
+                'value' => '0',
             ],
             [
                 'label' => 'Main Website',
@@ -81,11 +81,14 @@ public function testToOptionArray()
                         'value' => [
                             [
                                 'label' => '        Default Store View',
-                                'value' => '1'
+                                'value' => '1',
+                                '__disableTmpl' => true,
                             ]
-                        ]
+                        ],
+                        '__disableTmpl' => true,
                     ]
-                ]
+                ],
+                '__disableTmpl' => true,
             ]
         ];
 
@@ -104,14 +107,6 @@ public function testToOptionArray()
         $this->storeMock->expects($this->atLeastOnce())->method('getName')->willReturn('Default Store View');
         $this->storeMock->expects($this->atLeastOnce())->method('getId')->willReturn('1');
 
-        $this->escaperMock->expects($this->atLeastOnce())->method('escapeHtml')->willReturnMap(
-            [
-                ['Default Store View', null, 'Default Store View'],
-                ['Main Website Store', null, 'Main Website Store'],
-                ['Main Website', null, 'Main Website']
-            ]
-        );
-
         $this->assertEquals($expectedOptions, $this->options->toOptionArray());
     }
 }
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
@@ -5,7 +5,7 @@
  */
 
 /**
- * Tests for \Magento\Framework\Data\Form\Field\Image
+ * Test for \Magento\Framework\Data\Form\Field\Image.
  */
 namespace Magento\Config\Test\Unit\Block\System\Config\Form\Field;
 
@@ -60,6 +60,8 @@ protected function setUp()
     }
 
     /**
+     * Get element with value and check data.
+     *
      * @covers \Magento\Config\Block\System\Config\Form\Field\Image::_getUrl
      */
     public function testGetElementHtmlWithValue()
@@ -100,7 +102,17 @@ public function testGetElementHtmlWithValue()
             . $this->testData['html_id']
             . $this->testData['html_id_suffix'];
 
+        $this->escaperMock->expects($this->once())
+            ->method('escapeUrl')
+            ->with($url . $this->testData['path'] . '/' . $this->testData['value'])
+            ->willReturn($url . $this->testData['path'] . '/' . $this->testData['value']);
+        $this->escaperMock->expects($this->exactly(3))
+            ->method('escapeHtmlAttr')
+            ->with($this->testData['value'])
+            ->willReturn($this->testData['value']);
+        $this->escaperMock->expects($this->atLeastOnce())->method('escapeHtml')->willReturn($expectedHtmlId);
         $html = $this->image->getElementHtml();
+
         $this->assertContains('class="input-file"', $html);
         $this->assertContains('<input', $html);
         $this->assertContains('type="file"', $html);
diff --git a/app/code/Magento/CustomerImportExport/Model/Export/Customer.php b/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
@@ -139,12 +139,12 @@ protected function _getEntityCollection()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getHeaderColumns()
     {
         $validAttributeCodes = $this->_getExportAttributeCodes();
-        return array_merge($this->_permanentAttributes, $validAttributeCodes, ['password']);
+        return array_merge($this->_permanentAttributes, $validAttributeCodes);
     }
 
     /**
diff --git a/app/code/Magento/Store/Model/System/Store.php b/app/code/Magento/Store/Model/System/Store.php
@@ -142,6 +142,7 @@ public function getStoreValuesForForm($empty = false, $all = false)
                     $values[] = [
                         'label' => str_repeat($nonEscapableNbspChar, 4) . $store->getName(),
                         'value' => $store->getId(),
+                        '__disableTmpl' => true,
                     ];
                 }
                 if ($groupShow) {
diff --git a/app/code/Magento/Store/Test/Unit/Model/System/StoreTest.php b/app/code/Magento/Store/Test/Unit/Model/System/StoreTest.php
@@ -268,7 +268,11 @@ public function getStoreValuesForFormDataProvider()
                     [
                         'label' => str_repeat($nonEscapableNbspChar, 4) . $groupName,
                         'value' => [
-                            ['label' => str_repeat($nonEscapableNbspChar, 4) . $storeName, 'value' => $storeId]
+                            [
+                                'label' => str_repeat($nonEscapableNbspChar, 4) . $storeName,
+                                'value' => $storeId,
+                                '__disableTmpl' => true,
+                            ]
                         ],
                         '__disableTmpl' => true
                     ],
diff --git a/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php b/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php
@@ -68,26 +68,6 @@ public function toOptionArray()
         return $this->options;
     }
 
-    /**
-     * Sanitize website/store option name
-     *
-     * @param string $name
-     *
-     * @return string
-     */
-    protected function sanitizeName($name)
-    {
-        $matches = [];
-        preg_match('/\$[:]*{(.)*}/', $name, $matches);
-        if (count($matches) > 0) {
-            $name = $this->escaper->escapeHtml($this->escaper->escapeJs($name));
-        } else {
-            $name = $this->escaper->escapeHtml($name);
-        }
-
-        return $name;
-    }
-
     /**
      * Generate current options
      *
@@ -108,22 +88,25 @@ protected function generateCurrentOptions()
                     /** @var  \Magento\Store\Model\Store $store */
                     foreach ($storeCollection as $store) {
                         if ($store->getGroupId() == $group->getId()) {
-                            $name = $this->sanitizeName($store->getName());
+                            $name = $store->getName();
                             $stores[$name]['label'] = str_repeat(' ', 8) . $name;
                             $stores[$name]['value'] = $store->getId();
+                            $stores[$name]['__disableTmpl'] = true;
                         }
                     }
                     if (!empty($stores)) {
-                        $name = $this->sanitizeName($group->getName());
+                        $name = $group->getName();
                         $groups[$name]['label'] = str_repeat(' ', 4) . $name;
                         $groups[$name]['value'] = array_values($stores);
+                        $groups[$name]['__disableTmpl'] = true;
                     }
                 }
             }
             if (!empty($groups)) {
-                $name = $this->sanitizeName($website->getName());
+                $name = $website->getName();
                 $this->currentOptions[$name]['label'] = $name;
                 $this->currentOptions[$name]['value'] = array_values($groups);
+                $this->currentOptions[$name]['__disableTmpl'] = true;
             }
         }
     }
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest" summary="Navigate to menu chapter">
         <variation name="NavigateMenuTestBIEssentials" summary="Navigate through BI Essentials admin menu to Sign Up page" ticketId="MAGETWO-63700">
+            <data name="issue" xsi:type="string">MC-22618: [MTF] Fix NavigateMenuTestBIEssentials test</data>
             <data name="menuItem" xsi:type="string">Reports > BI Essentials</data>
             <data name="waitMenuItemNotVisible" xsi:type="boolean">false</data>
             <data name="businessIntelligenceLink" xsi:type="string">https://account.magento.com/onboarding/steps/view/step/gmv/</data>
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php
@@ -237,9 +237,11 @@ public static function getEntityStoresDataProvider()
                     ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],
                     [
                         'label' => '    Main Website Store',
-                        'value' => [['label' => '    Default Store View', 'value' => 1]],
-                        '__disableTmpl' => true
-                    ]
+                        'value' => [
+                            ['label' => '    Default Store View', 'value' => 1, '__disableTmpl' => true],
+                        ],
+                        '__disableTmpl' => true,
+                    ],
                 ],
             ],
             [
@@ -249,10 +251,12 @@ public static function getEntityStoresDataProvider()
                     ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],
                     [
                         'label' => '    Main Website Store',
-                        'value' => [['label' => '    Default Store View', 'value' => 1]],
-                        '__disableTmpl' => true
-                    ]
-                ]
+                        'value' => [
+                            ['label' => '    Default Store View', 'value' => 1, '__disableTmpl' => true],
+                        ],
+                        '__disableTmpl' => true,
+                    ],
+                ],
             ],
             [
                 ['entity_id' => 2, 'name' => 'product2', 'url_key' => 'product2', 'store_ids' => [1]],
@@ -261,11 +265,13 @@ public static function getEntityStoresDataProvider()
                     ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],
                     [
                         'label' => '    Main Website Store',
-                        'value' => [['label' => '    Default Store View', 'value' => 1]],
-                        '__disableTmpl' => true
-                    ]
-                ]
-            ]
+                        'value' => [
+                            ['label' => '    Default Store View', 'value' => 1, '__disableTmpl' => true],
+                        ],
+                        '__disableTmpl' => true,
+                    ],
+                ],
+            ],
         ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php
@@ -81,8 +81,10 @@ public function testGetEntityStores()
             ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],
             [
                 'label' => '    Main Website Store',
-                'value' => [['label' => '    Default Store View', 'value' => 1]],
-                '__disableTmpl' => true
+                'value' => [
+                    ['label' => '    Default Store View', 'value' => 1, '__disableTmpl' => true]
+                ],
+                '__disableTmpl' => true,
             ],
         ];
         $this->assertEquals($expectedStores, $form->getElement('store_id')->getValues());
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Image.php b/lib/internal/Magento/Framework/Data/Form/Element/Image.php
@@ -4,15 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Category form input image element
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Framework\Data\Form\Element;
 
 use Magento\Framework\UrlInterface;
 
+/**
+ * Category form input image element.
+ */
 class Image extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
     /**
@@ -54,6 +52,7 @@ public function getElementHtml()
             if (!preg_match("/^http\:\/\/|https\:\/\//", $url)) {
                 $url = $this->_urlBuilder->getBaseUrl(['_type' => UrlInterface::URL_TYPE_MEDIA]) . $url;
             }
+            $url = $this->_escaper->escapeUrl($url);
 
             $html = '<a href="' .
                 $url .
@@ -70,10 +69,10 @@ public function getElementHtml()
                 '" id="' .
                 $this->getHtmlId() .
                 '_image" title="' .
-                $this->getValue() .
+                $this->_escaper->escapeHtmlAttr($this->getValue()) .
                 '"' .
                 ' alt="' .
-                $this->getValue() .
+                $this->_escaper->escapeHtmlAttr($this->getValue()) .
                 '" height="22" width="22" class="small-image-preview v-middle"  ' .
                 $this->_getUiId() .
                 ' />' .
@@ -127,7 +126,8 @@ protected function _getDeleteCheckbox()
      */
     protected function _getHiddenInput()
     {
-        return '<input type="hidden" name="' . parent::getName() . '[value]" value="' . $this->getValue() . '" />';
+        return '<input type="hidden" name="' . parent::getName() . '[value]" value="' .
+            $this->_escaper->escapeHtmlAttr($this->getValue()) . '" />';
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImageTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImageTest.php

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function testToOptionArray()`
`71`	`71`	`$expectedOptions = [`
`72`	`72`	`[`
`73`	`73`	`'label' => __('All Store Views'),`
`74`		`- 'value' => '0'`
	`74`	`+ 'value' => '0',`
`75`	`75`	`],`
`76`	`76`	`[`
`77`	`77`	`'label' => 'Main Website',`
`@@ -81,11 +81,14 @@ public function testToOptionArray()`
`81`	`81`	`'value' => [`
`82`	`82`	`[`
`83`	`83`	`'label' => ' Default Store View',`
`84`		`- 'value' => '1'`
	`84`	`+ 'value' => '1',`
	`85`	`+ '__disableTmpl' => true,`
`85`	`86`	`]`
`86`		`- ]`
	`87`	`+ ],`
	`88`	`+ '__disableTmpl' => true,`
`87`	`89`	`]`
`88`		`- ]`
	`90`	`+ ],`
	`91`	`+ '__disableTmpl' => true,`
`89`	`92`	`]`
`90`	`93`	`];`
`91`	`94`
`@@ -104,14 +107,6 @@ public function testToOptionArray()`
`104`	`107`	`$this->storeMock->expects($this->atLeastOnce())->method('getName')->willReturn('Default Store View');`
`105`	`108`	`$this->storeMock->expects($this->atLeastOnce())->method('getId')->willReturn('1');`
`106`	`109`
`107`		`- $this->escaperMock->expects($this->atLeastOnce())->method('escapeHtml')->willReturnMap(`
`108`		`- [`
`109`		`- ['Default Store View', null, 'Default Store View'],`
`110`		`- ['Main Website Store', null, 'Main Website Store'],`
`111`		`- ['Main Website', null, 'Main Website']`
`112`		`- ]`
`113`		`- );`
`114`		`-`
`115`	`110`	`$this->assertEquals($expectedOptions, $this->options->toOptionArray());`
`116`	`111`	`}`
`117`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,12 +139,12 @@ protected function _getEntityCollection()`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`/**`
`142`		`- * {@inheritdoc}`
	`142`	`+ * @inheritdoc`
`143`	`143`	`*/`
`144`	`144`	`protected function _getHeaderColumns()`
`145`	`145`	`{`
`146`	`146`	`$validAttributeCodes = $this->_getExportAttributeCodes();`
`147`		`- return array_merge($this->_permanentAttributes, $validAttributeCodes, ['password']);`
	`147`	`+ return array_merge($this->_permanentAttributes, $validAttributeCodes);`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,7 @@ public function getStoreValuesForForm($empty = false, $all = false)`
`142`	`142`	`$values[] = [`
`143`	`143`	`'label' => str_repeat($nonEscapableNbspChar, 4) . $store->getName(),`
`144`	`144`	`'value' => $store->getId(),`
	`145`	`+ '__disableTmpl' => true,`
`145`	`146`	`];`
`146`	`147`	`}`
`147`	`148`	`if ($groupShow) {`
Original file line number	Diff line number	Diff line change
`@@ -68,26 +68,6 @@ public function toOptionArray()`
`68`	`68`	`return $this->options;`
`69`	`69`	`}`
`70`	`70`
`71`		`- /**`
`72`		`- * Sanitize website/store option name`
`73`		`- *`
`74`		`- * @param string $name`
`75`		`- *`
`76`		`- * @return string`
`77`		`- */`
`78`		`- protected function sanitizeName($name)`
`79`		`- {`
`80`		`- $matches = [];`
`81`		`- preg_match('/\$[:]{(.)}/', $name, $matches);`
`82`		`- if (count($matches) > 0) {`
`83`		`- $name = $this->escaper->escapeHtml($this->escaper->escapeJs($name));`
`84`		`- } else {`
`85`		`- $name = $this->escaper->escapeHtml($name);`
`86`		`- }`
`87`		`-`
`88`		`- return $name;`
`89`		`- }`
`90`		`-`
`91`	`71`	`/**`
`92`	`72`	`* Generate current options`
`93`	`73`	`*`
`@@ -108,22 +88,25 @@ protected function generateCurrentOptions()`
`108`	`88`	`/** @var \Magento\Store\Model\Store $store */`
`109`	`89`	`foreach ($storeCollection as $store) {`
`110`	`90`	`if ($store->getGroupId() == $group->getId()) {`
`111`		`- $name = $this->sanitizeName($store->getName());`
	`91`	`+ $name = $store->getName();`
`112`	`92`	`$stores[$name]['label'] = str_repeat(' ', 8) . $name;`
`113`	`93`	`$stores[$name]['value'] = $store->getId();`
	`94`	`+ $stores[$name]['__disableTmpl'] = true;`
`114`	`95`	`}`
`115`	`96`	`}`
`116`	`97`	`if (!empty($stores)) {`
`117`		`- $name = $this->sanitizeName($group->getName());`
	`98`	`+ $name = $group->getName();`
`118`	`99`	`$groups[$name]['label'] = str_repeat(' ', 4) . $name;`
`119`	`100`	`$groups[$name]['value'] = array_values($stores);`
	`101`	`+ $groups[$name]['__disableTmpl'] = true;`
`120`	`102`	`}`
`121`	`103`	`}`
`122`	`104`	`}`
`123`	`105`	`if (!empty($groups)) {`
`124`		`- $name = $this->sanitizeName($website->getName());`
	`106`	`+ $name = $website->getName();`
`125`	`107`	`$this->currentOptions[$name]['label'] = $name;`
`126`	`108`	`$this->currentOptions[$name]['value'] = array_values($groups);`
	`109`	`+ $this->currentOptions[$name]['__disableTmpl'] = true;`
`127`	`110`	`}`
`128`	`111`	`}`
`129`	`112`	`}`