MC-33823: Merge CE, EE and B2B changes

Oleksandr Gorkun · Oleksandr Gorkun · commit 3d41baed7775 · 2020-05-13T19:44:16.000-05:00
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -116,7 +116,7 @@ $numColumns = count($block->getColumns());
                                 'onclick',
                                 /* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
                                 /* @noEscape */ ($_curPage - 1) . '\');event.preventDefault();',
-                                '. admin__data-grid-pager button.action-previous'
+                                '.admin__data-grid-pager button.action-previous'
                             ) ?>
                         <?php else: ?>
                             <button type="button" class="action-previous disabled">
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
@@ -127,9 +127,7 @@ function changeTaxClassId() {
                 });
                 ";
 
-            $tax->setAfterElementHtml(
-                /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false)
-            );
+            $tax->setAfterElementHtml($this->secureRenderer->renderTag('script', [], $scriptString, false));
         }
 
         $weight = $this->getForm()->getElement('weight');
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontProductInfoMainSection">
-        <element name="AddToCart" type="button" selector="#product-addtocart-button"/>
-        <element name="updateCart" type="button" selector="#product-updatecart-button" timeout="30"/>
+        <element name="AddToCart" type="button" selector="button#product-addtocart-button"/>
+        <element name="updateCart" type="button" selector="button#product-updatecart-button" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
@@ -92,7 +92,7 @@ public function testGetAfterElementHtml()
 
         $this->assertStringEndsWith('</script>' . $afterHtmlCode, $actual);
         $this->assertStringStartsWith('<script >', trim($actual));
-        $this->assertContains('test_prefix_spec_element_test_suffix', $actual);
+        $this->assertStringContainsString('test_prefix_spec_element_test_suffix', $actual);
     }
 
     /**
diff --git a/app/code/Magento/Csp/Model/BlockCache.php b/app/code/Magento/Csp/Model/BlockCache.php
@@ -70,6 +70,7 @@ public function load($identifier)
             }
         } catch (\Throwable $exception) {
             //Most likely block HTML was cached without policy data.
+            $data = null;
         }
         if ($data) {
             foreach ($data['policies'] as $policyData) {
diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
@@ -14,7 +14,8 @@
         "magento/module-theme": "*",
         "magento/module-require-js": "*",
         "magento/module-media-storage": "*",
-        "magento/module-variable": "*"
+        "magento/module-variable": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
         "magento/module-theme": "*"
diff --git a/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php b/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php
@@ -44,6 +44,7 @@ protected function setUp(): void
     {
         $this->escaperMock = $this->createMock(Escaper::class);
         $this->escaperMock->expects($this->any())->method('escapeHtml')->willReturnArgument(0);
+        $this->escaperMock->expects($this->any())->method('escapeHtmlAttr')->willReturnArgument(0);
         $this->contextMock = $this->createPartialMock(Context::class, ['getEscaper']);
         $this->contextMock->expects($this->any())->method('getEscaper')->willReturn($this->escaperMock);
         $randomMock = $this->createMock(Random::class);
diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json
@@ -12,7 +12,8 @@
         "magento/module-customer": "*",
         "magento/module-security": "*",
         "magento/module-store": "*",
-        "magento/module-user": "*"
+        "magento/module-user": "*",
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json
@@ -14,7 +14,8 @@
         "magento/module-email": "*",
         "magento/module-require-js": "*",
         "magento/module-store": "*",
-        "magento/module-widget": "*"
+        "magento/module-widget": "*",
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
@@ -91,7 +91,7 @@ public function testGetElementHtml()
             '<input id="time_condition" type="hidden" name="test_name" value="',
             $testString
         );
-        $this->assertStringEndsWith(
+        $this->assertStringContainsString(
             '<input id="test_name_prefixtest_html_idtest_name_suffix" ' .
             'name="test_name"  data-ui-id="form-element-test_name" value="" type="file"',
             $testString
diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json
@@ -12,7 +12,8 @@
         "magento/module-directory": "*",
         "magento/module-quote": "*",
         "magento/module-sales": "*",
-        "magento/module-store": "*"
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php
@@ -130,7 +130,7 @@ public function testRender($requestCountry, $requestDefaultCountry, $canUseDefau
         }
         $this->_jsHelper->expects($this->once())
             ->method('getScript')
-            ->with(new LogicalAnd($constraints));
+            ->with(self::logicalAnd($constraints));
         $this->_url->expects($this->once())
             ->method('getUrl')
             ->with(
diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json
@@ -19,7 +19,8 @@
         "magento/module-reports": "*",
         "magento/module-sales": "*",
         "magento/module-shipping": "*",
-        "magento/module-store": "*"
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
         "magento/module-tax-sample-data": "*"
diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json
@@ -10,7 +10,8 @@
         "magento/module-backend": "*",
         "magento/module-directory": "*",
         "magento/module-store": "*",
-        "magento/module-tax": "*"
+        "magento/module-tax": "*",
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json
@@ -12,7 +12,8 @@
         "magento/module-email": "*",
         "magento/module-integration": "*",
         "magento/module-security": "*",
-        "magento/module-store": "*"
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json
@@ -12,7 +12,8 @@
         "magento/module-cms": "*",
         "magento/module-store": "*",
         "magento/module-theme": "*",
-        "magento/module-variable": "*"
+        "magento/module-variable": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
         "magento/module-widget-sample-data": "*"
diff --git a/dev/tests/integration/testsuite/Magento/Csp/CspAwareActionTest.php b/dev/tests/integration/testsuite/Magento/Csp/CspAwareActionTest.php
@@ -34,7 +34,7 @@ public function testAwareAction(): void
         $header = $this->getResponse()->getHeader('Content-Security-Policy');
         $this->assertNotEmpty($header);
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             'script-src https://controller.magento.com'
                 .' \'self\' \'sha256-H4RRnauTM2X2Xg/z9zkno1crqhsaY3uKKu97uwmnXXE=\'',
             $header->getFieldValue()
diff --git a/dev/tests/integration/testsuite/Magento/Csp/CspTest.php b/dev/tests/integration/testsuite/Magento/Csp/CspTest.php
@@ -23,10 +23,6 @@ class CspTest extends AbstractController
      */
     private function searchInResponse($response, string $search): bool
     {
-        if (mb_stripos(mb_strtolower($response->getBody()), mb_strtolower($search)) !== false) {
-            return true;
-        }
-
         foreach ($response->getHeaders() as $header) {
             if (mb_stripos(mb_strtolower($header->toString()), mb_strtolower($search)) !== false) {
                 return true;
diff --git a/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php b/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php
@@ -29,14 +29,14 @@ public function testPhtmlHelper(): void
         $this->dispatch('csputil/csp/helper');
         $content = $this->getResponse()->getContent();
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<script src="http&#x3A;&#x2F;&#x2F;my.magento.com&#x2F;static&#x2F;script.js"/>',
             $content
         );
-        $this->assertContains("<script>\n    let myVar = 1;\n</script>", $content);
+        $this->assertStringContainsString("<script>\n    let myVar = 1;\n</script>", $content);
         $header = $this->getResponse()->getHeader('Content-Security-Policy');
         $this->assertNotEmpty($header);
-        $this->assertContains('http://my.magento.com', $header->getFieldValue());
-        $this->assertContains('\'sha256-H4RRnauTM2X2Xg/z9zkno1crqhsaY3uKKu97uwmnXXE=\'', $header->getFieldValue());
+        $this->assertStringContainsString('http://my.magento.com', $header->getFieldValue());
+        $this->assertStringContainsString('\'sha256-H4RRnauTM2X2Xg/z9zkno1crqhsaY3uKKu97uwmnXXE=\'', $header->getFieldValue());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -127,9 +127,7 @@ function changeTaxClassId() {`
`127`	`127`	`});`
`128`	`128`	`";`
`129`	`129`
`130`		`- $tax->setAfterElementHtml(`
`131`		`- /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false)`
`132`		`- );`
	`130`	`+ $tax->setAfterElementHtml($this->secureRenderer->renderTag('script', [], $scriptString, false));`
`133`	`131`	`}`
`134`	`132`
`135`	`133`	`$weight = $this->getForm()->getElement('weight');`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function testGetAfterElementHtml()`
`92`	`92`
`93`	`93`	`$this->assertStringEndsWith('</script>' . $afterHtmlCode, $actual);`
`94`	`94`	`$this->assertStringStartsWith('<script >', trim($actual));`
`95`		`- $this->assertContains('test_prefix_spec_element_test_suffix', $actual);`
	`95`	`+ $this->assertStringContainsString('test_prefix_spec_element_test_suffix', $actual);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ public function load($identifier)`
`70`	`70`	`}`
`71`	`71`	`} catch (\Throwable $exception) {`
`72`	`72`	`//Most likely block HTML was cached without policy data.`
	`73`	`+ $data = null;`
`73`	`74`	`}`
`74`	`75`	`if ($data) {`
`75`	`76`	`foreach ($data['policies'] as $policyData) {`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ protected function setUp(): void`
`44`	`44`	`{`
`45`	`45`	`$this->escaperMock = $this->createMock(Escaper::class);`
`46`	`46`	`$this->escaperMock->expects($this->any())->method('escapeHtml')->willReturnArgument(0);`
	`47`	`+ $this->escaperMock->expects($this->any())->method('escapeHtmlAttr')->willReturnArgument(0);`
`47`	`48`	`$this->contextMock = $this->createPartialMock(Context::class, ['getEscaper']);`
`48`	`49`	`$this->contextMock->expects($this->any())->method('getEscaper')->willReturn($this->escaperMock);`
`49`	`50`	`$randomMock = $this->createMock(Random::class);`