merge magento/2.4-develop into magento-engcom/login-as-customer-150

magento-mts-svc · web-flow · commit 88b844ee02e1 · 2020-08-11T08:33:52.000-07:00
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -5,8 +5,10 @@
  */
 
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+$blockId = $block->getId();
 ?>
-<div id="product_composite_configure" class="product-configure-popup">
+<div id="product_composite_configure"
+     class="product-configure-popup product-configure-popup-<?= $block->escapeHtmlAttr($blockId) ?>">
     <iframe name="product_composite_configure_iframe" id="product_composite_configure_iframe"></iframe>
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onload',
@@ -31,40 +33,45 @@
     </form>
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onsubmit',
-        "productConfigure.onConfirmBtn();event.preventDefault()",
+        'productConfigure.onConfirmBtn();event.preventDefault()',
         '.product_composite_configure_form:last-of-type'
     ) ?>
 
     <div id="product_composite_configure_confirmed" class="product_composite_configure_confirmed"></div>
 
     <?php $scriptString = <<<script
-        prodCompConfIframe = document.querySelector("iframe[name='product_composite_configure_iframe']:last-of-type");
+        prodCompConfIframe = document.querySelector(
+            ".product-configure-popup-$blockId iframe[name='product_composite_configure_iframe']"
+        );
         prodCompConfIframe.style.width = 0;
         prodCompConfIframe.style.height = 0;
         prodCompConfIframe.style.border = "0px solid #fff";
         prodCompConfIframe.style.position = "absolute";
         prodCompConfIframe.style.top = "-1000px";
         prodCompConfIframe.style.left = "-1000px";
-        prodCompConfMessages = document.querySelectorAll(".product_composite_configure_messages");
-        for (var i = 0; i < prodCompConfMessages.length; i++) {
-            prodCompConfMessages[i].style.display = "none";
-        }
-        prodCompConfFormAdd = document.querySelectorAll(".product_composite_configure_form_additional");
-        for (var i = 0; i < prodCompConfFormAdd.length; i++) {
-            prodCompConfFormAdd[i].style.display = "none";
-        }
-        prodCompConfFormConf = document.querySelectorAll(".product_composite_configure_form_confirmed");
-        for (var i = 0; i < prodCompConfFormConf.length; i++) {
-            prodCompConfFormConf[i].style.display = "none";
-        }
-        prodCompConfConf = document.querySelectorAll(".product_composite_configure_confirmed");
-        for (var i = 0; i < prodCompConfConf.length; i++) {
-            prodCompConfConf[i].style.display = "none";
-        }
-        prodConfPopup = document.querySelectorAll(".product-configure-popup");
-        for (var i = 0; i < prodConfPopup.length; i++) {
-            prodConfPopup[i].style.display = "none";
-        }
+
+        prodCompConfMessages = document.querySelector(
+            ".product-configure-popup-$blockId .product_composite_configure_messages"
+        );
+        prodCompConfMessages.style.display = "none";
+
+        prodCompConfFormAdd = document.querySelector(
+            ".product-configure-popup-$blockId .product_composite_configure_form_additional"
+        );
+        prodCompConfFormAdd.style.display = "none";
+
+        prodCompConfFormConf = document.querySelector(
+            ".product-configure-popup-$blockId .product_composite_configure_form_confirmed"
+        );
+        prodCompConfFormConf.style.display = "none";
+
+        prodCompConfConf = document.querySelector(
+            ".product-configure-popup-$blockId .product_composite_configure_confirmed"
+        );
+        prodCompConfConf.style.display = "none";
+
+        prodConfPopup = document.querySelector(".product-configure-popup-$blockId");
+        prodConfPopup.style.display = "none";
 
         require([
             "jquery",
diff --git a/app/code/Magento/Paypal/Model/AbstractConfig.php b/app/code/Magento/Paypal/Model/AbstractConfig.php
@@ -58,7 +58,7 @@ abstract class AbstractConfig implements ConfigInterface
     /**
      * @var string
      */
-    private static $bnCode = 'Magento_Cart_%s';
+    private static $bnCode = 'Magento_2_%s';
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
@@ -15,6 +15,9 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Test for \Magento\Paypal\Model\AbstractConfig
+ */
 class AbstractConfigTest extends TestCase
 {
 
@@ -353,7 +356,7 @@ public function testGetBuildNotationCode()
             $productMetadata
         );
 
-        self::assertEquals('Magento_Cart_SomeEdition', $this->config->getBuildNotationCode());
+        self::assertEquals('Magento_2_SomeEdition', $this->config->getBuildNotationCode());
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/NvpTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/NvpTest.php
@@ -95,7 +95,7 @@ public function testRequestTotalsAndLineItemsWithFPT()
             . '&SHIPPINGAMT=0.00&ITEMAMT=112.70&TAXAMT=0.00'
             . '&L_NAME0=Simple+Product+FPT&L_QTY0=1&L_AMT0=100.00'
             . '&L_NAME1=FPT&L_QTY1=1&L_AMT1=12.70'
-            . '&METHOD=SetExpressCheckout&VERSION=72.0&BUTTONSOURCE=Magento_Cart_';
+            . '&METHOD=SetExpressCheckout&VERSION=72.0&BUTTONSOURCE=Magento_2_';
 
         $this->httpClient->method('write')
             ->with(
@@ -146,7 +146,7 @@ public function testCallRefundTransaction()
 
         $httpQuery = 'TRANSACTIONID=fooTransactionId&REFUNDTYPE=Partial'
             .'&CURRENCYCODE=USD&AMT=145.98&METHOD=RefundTransaction'
-            .'&VERSION=72.0&BUTTONSOURCE=Magento_Cart_';
+            .'&VERSION=72.0&BUTTONSOURCE=Magento_2_';
 
         $this->httpClient->expects($this->once())->method('write')
             ->with(
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/PayflowNvpTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/PayflowNvpTest.php
@@ -95,7 +95,7 @@ public function testRequestLineItems()
             . 'L_NAME1=Simple 2&L_QTY1=2&L_COST1=9.69&'
             . 'L_NAME2=Simple 3&L_QTY2=3&L_COST2=11.69&'
             . 'L_NAME3=Discount&L_QTY3=1&L_COST3=-10.00&'
-            . 'TRXTYPE=A&ACTION=S&BUTTONSOURCE=Magento_Cart_';
+            . 'TRXTYPE=A&ACTION=S&BUTTONSOURCE=Magento_2_';
 
         $this->httpClient->method('write')
             ->with(
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php
@@ -119,14 +119,14 @@ public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void
       cart_id: "$cartId"
       payment_method: {
           code: "$paymentMethod"
-            payflow_link: 
+            payflow_link:
             {
            cancel_url:"paypal/payflow/cancelPayment"
            return_url:"paypal/payflow/returnUrl"
            error_url:"paypal/payflow/errorUrl"
           }
       }
-  }) {    
+  }) {
        cart {
           selected_payment_method {
           code
@@ -142,7 +142,7 @@ public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void
 QUERY;
 
         $productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);
-        $button = 'Magento_Cart_' . $productMetadata->getEdition();
+        $button = 'Magento_2_' . $productMetadata->getEdition();
 
         $payflowLinkResponse = new DataObject(
             [
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php
@@ -117,14 +117,14 @@ public function testResolvePlaceOrderWithPayflowLink(): void
       cart_id: "$cartId"
       payment_method: {
           code: "$paymentMethod"
-            payflow_link: 
+            payflow_link:
             {
            cancel_url:"paypal/payflow/cancel"
            return_url:"paypal/payflow/return"
            error_url:"paypal/payflow/error"
           }
       }
-  }) {    
+  }) {
        cart {
           selected_payment_method {
           code
@@ -140,7 +140,7 @@ public function testResolvePlaceOrderWithPayflowLink(): void
 QUERY;
 
         $productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);
-        $button = 'Magento_Cart_' . $productMetadata->getEdition();
+        $button = 'Magento_2_' . $productMetadata->getEdition();
 
         $payflowLinkResponse = new DataObject(
             [
@@ -219,14 +219,14 @@ public function testResolveWithPayflowLinkDeclined(): void
       cart_id: "$cartId"
       payment_method: {
           code: "$paymentMethod"
-            payflow_link: 
+            payflow_link:
             {
            cancel_url:"paypal/payflow/cancelPayment"
            return_url:"paypal/payflow/returnUrl"
            error_url:"paypal/payflow/returnUrl"
           }
       }
-  }) {    
+  }) {
        cart {
           selected_payment_method {
           code
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPaymentsAdvancedTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPaymentsAdvancedTest.php
@@ -108,7 +108,7 @@ public function testResolvePlaceOrderWithPaymentsAdvanced(): void
         $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);
-        $button = 'Magento_Cart_' . $productMetadata->getEdition();
+        $button = 'Magento_2_' . $productMetadata->getEdition();
 
         $payflowLinkResponse = new DataObject(
             [
@@ -256,7 +256,7 @@ private function setPaymentMethodAndPlaceOrder(string $cartId, string $paymentMe
              error_url:"paypal/payflowadvanced/customerror"
           }
       }
-  }) {    
+  }) {
        cart {
           selected_payment_method {
           code
@@ -300,7 +300,7 @@ private function setPaymentMethodWithInValidUrl(string $cartId, string $paymentM
              error_url:"paypal/payflowadvanced/error"
           }
       }
-  }) {    
+  }) {
        cart {
           selected_payment_method {
           code
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/paypal_place_order_request.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/paypal_place_order_request.php
@@ -13,7 +13,7 @@
 $notifyUrl = $url->getUrl('paypal/ipn/');
 
 $productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);
-$button = 'Magento_Cart_' . $productMetadata->getEdition();
+$button = 'Magento_2_' . $productMetadata->getEdition();
 
 return [
     'TOKEN' => $token,
diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php
@@ -167,8 +167,9 @@ private function caseClassesAndIdentifiers($currentModule, $file, &$contents)
                 '[_\\\\]|',
                 Files::init()->getNamespaces()
             )
-            . '[_\\\\])[a-zA-Z0-9]+)'
-            . '(?<class_inside_module>[a-zA-Z0-9_\\\\]*))\b(?:::(?<module_scoped_key>[a-z0-9_]+)[\'"])?~';
+            . '(?<delimiter>[_\\\\]))[a-zA-Z0-9]{2,})'
+            . '(?<class_inside_module>\\4[a-zA-Z0-9_\\\\]{2,})?)\b'
+            . '(?:::(?<module_scoped_key>[A-Za-z0-9_/.]+)[\'"])?~';
 
         if (!preg_match_all($pattern, $contents, $matches)) {
             return [];
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -2776,7 +2776,7 @@ public function addIndex(
                 if (in_array(strtolower($indexType), ['primary', 'unique'])) {
                     $match = [];
                     // phpstan:ignore
-                    if (preg_match('#SQLSTATE\[23000\]: [^:]+: 1062[^\']+\'([\d-\.]+)\'#', $e->getMessage(), $match)) {
+                    if (preg_match('#SQLSTATE\[23000\]: [^:]+: 1062[^\']+\'([\d.-]+)\'#', $e->getMessage(), $match)) {
                         $ids = explode('-', $match[1]);
                         $this->_removeDuplicateEntry($tableName, $fields, $ids);
                         continue;
@@ -2788,6 +2788,7 @@ public function addIndex(
 
         $this->resetDdlCache($tableName, $schemaName);
 
+        // @phpstan-ignore-next-line
         return $result;
     }
 
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,9 @@`
`15`	`15`	`use PHPUnit\Framework\MockObject\MockObject;`
`16`	`16`	`use PHPUnit\Framework\TestCase;`
`17`	`17`
	`18`	`+/**`
	`19`	`+ * Test for \Magento\Paypal\Model\AbstractConfig`
	`20`	`+ */`
`18`	`21`	`class AbstractConfigTest extends TestCase`
`19`	`22`	`{`
`20`	`23`
`@@ -353,7 +356,7 @@ public function testGetBuildNotationCode()`
`353`	`356`	`$productMetadata`
`354`	`357`	`);`
`355`	`358`
`356`		`- self::assertEquals('Magento_Cart_SomeEdition', $this->config->getBuildNotationCode());`
	`359`	`+ self::assertEquals('Magento_2_SomeEdition', $this->config->getBuildNotationCode());`
`357`	`360`	`}`
`358`	`361`
`359`	`362`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -119,14 +119,14 @@ public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void`
`119`	`119`	`cart_id: "$cartId"`
`120`	`120`	`payment_method: {`
`121`	`121`	`code: "$paymentMethod"`
`122`		`- payflow_link:`
	`122`	`+ payflow_link:`
`123`	`123`	`{`
`124`	`124`	`cancel_url:"paypal/payflow/cancelPayment"`
`125`	`125`	`return_url:"paypal/payflow/returnUrl"`
`126`	`126`	`error_url:"paypal/payflow/errorUrl"`
`127`	`127`	`}`
`128`	`128`	`}`
`129`		`- }) {`
	`129`	`+ }) {`
`130`	`130`	`cart {`
`131`	`131`	`selected_payment_method {`
`132`	`132`	`code`
`@@ -142,7 +142,7 @@ public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void`
`142`	`142`	`QUERY;`
`143`	`143`
`144`	`144`	`$productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);`
`145`		`- $button = 'Magento_Cart_' . $productMetadata->getEdition();`
	`145`	`+ $button = 'Magento_2_' . $productMetadata->getEdition();`
`146`	`146`
`147`	`147`	`$payflowLinkResponse = new DataObject(`
`148`	`148`	`[`
Original file line number	Diff line number	Diff line change
`@@ -117,14 +117,14 @@ public function testResolvePlaceOrderWithPayflowLink(): void`
`117`	`117`	`cart_id: "$cartId"`
`118`	`118`	`payment_method: {`
`119`	`119`	`code: "$paymentMethod"`
`120`		`- payflow_link:`
	`120`	`+ payflow_link:`
`121`	`121`	`{`
`122`	`122`	`cancel_url:"paypal/payflow/cancel"`
`123`	`123`	`return_url:"paypal/payflow/return"`
`124`	`124`	`error_url:"paypal/payflow/error"`
`125`	`125`	`}`
`126`	`126`	`}`
`127`		`- }) {`
	`127`	`+ }) {`
`128`	`128`	`cart {`
`129`	`129`	`selected_payment_method {`
`130`	`130`	`code`
`@@ -140,7 +140,7 @@ public function testResolvePlaceOrderWithPayflowLink(): void`
`140`	`140`	`QUERY;`
`141`	`141`
`142`	`142`	`$productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);`
`143`		`- $button = 'Magento_Cart_' . $productMetadata->getEdition();`
	`143`	`+ $button = 'Magento_2_' . $productMetadata->getEdition();`
`144`	`144`
`145`	`145`	`$payflowLinkResponse = new DataObject(`
`146`	`146`	`[`
`@@ -219,14 +219,14 @@ public function testResolveWithPayflowLinkDeclined(): void`
`219`	`219`	`cart_id: "$cartId"`
`220`	`220`	`payment_method: {`
`221`	`221`	`code: "$paymentMethod"`
`222`		`- payflow_link:`
	`222`	`+ payflow_link:`
`223`	`223`	`{`
`224`	`224`	`cancel_url:"paypal/payflow/cancelPayment"`
`225`	`225`	`return_url:"paypal/payflow/returnUrl"`
`226`	`226`	`error_url:"paypal/payflow/returnUrl"`
`227`	`227`	`}`
`228`	`228`	`}`
`229`		`- }) {`
	`229`	`+ }) {`
`230`	`230`	`cart {`
`231`	`231`	`selected_payment_method {`
`232`	`232`	`code`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public function testResolvePlaceOrderWithPaymentsAdvanced(): void`
`108`	`108`	`$cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');`
`109`	`109`
`110`	`110`	`$productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);`
`111`		`- $button = 'Magento_Cart_' . $productMetadata->getEdition();`
	`111`	`+ $button = 'Magento_2_' . $productMetadata->getEdition();`
`112`	`112`
`113`	`113`	`$payflowLinkResponse = new DataObject(`
`114`	`114`	`[`
`@@ -256,7 +256,7 @@ private function setPaymentMethodAndPlaceOrder(string $cartId, string $paymentMe`
`256`	`256`	`error_url:"paypal/payflowadvanced/customerror"`
`257`	`257`	`}`
`258`	`258`	`}`
`259`		`- }) {`
	`259`	`+ }) {`
`260`	`260`	`cart {`
`261`	`261`	`selected_payment_method {`
`262`	`262`	`code`
`@@ -300,7 +300,7 @@ private function setPaymentMethodWithInValidUrl(string $cartId, string $paymentM`
`300`	`300`	`error_url:"paypal/payflowadvanced/error"`
`301`	`301`	`}`
`302`	`302`	`}`
`303`		`- }) {`
	`303`	`+ }) {`
`304`	`304`	`cart {`
`305`	`305`	`selected_payment_method {`
`306`	`306`	`code`