Merge remote-tracking branch 'mainline/2.3-develop' into chaika_december

Author: olysenko

.travis.yml

@@ -64,6 +64,6 @@ script:
 
   # The scripts for grunt/phpunit type tests
   - if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
-  - if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js"] && [ $TEST_SUITE != "graphql-api-functional" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
+  - if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ] && [ $TEST_SUITE != "graphql-api-functional" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
   - if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi
   - if [ $TEST_SUITE == "graphql-api-functional" ]; then phpunit -c dev/tests/api-functional; fi

app/code/Magento/Analytics/Model/Cryptographer.php

@@ -129,7 +129,12 @@ private function getInitializationVector()
      */
     private function validateCipherMethod($cipherMethod)
     {
-        $methods = openssl_get_cipher_methods();
+        $methods = array_map(
+            'strtolower',
+            openssl_get_cipher_methods()
+        );
+        $cipherMethod = strtolower($cipherMethod);
+
         return (false !== array_search($cipherMethod, $methods));
     }
 }

app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml

@@ -11,26 +11,26 @@
     <actionGroup name="AdminOrderBraintreeFillActionGroup">
         <!--Select Braintree Payment method on Admin Order Create Page-->
         <click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
-        <waitForPageLoad stepKey="waitForBraintreeConfigs" time="5"/>
+        <waitForPageLoad stepKey="waitForBraintreeConfigs"/>
         <click stepKey="openCardTypes" selector="{{NewOrderSection.openCardTypes}}"/>
-        <waitForPageLoad stepKey="waitForCardTypes" time="3"/>
+        <waitForPageLoad stepKey="waitForCardTypes"/>
         <click stepKey="chooseCardType" selector="{{NewOrderSection.masterCard}}"/>
-        <waitForPageLoad stepKey="waitForCardSelected" time="3"/>
+        <waitForPageLoad stepKey="waitForCardSelected"/>
 
         <!--Choose Master Card from drop-down list-->
         <switchToIFrame stepKey="switchToCardNumber" selector="{{NewOrderSection.cardFrame}}"/>
         <fillField stepKey="fillCardNumber" selector="{{NewOrderSection.creditCardNumber}}" userInput="{{PaymentAndShippingInfo.cardNumber}}"/>
-        <waitForPageLoad stepKey="waitForFillCardNumber" time="1"/>
+        <waitForPageLoad stepKey="waitForFillCardNumber"/>
         <switchToIFrame stepKey="switchBackFromCard"/>
 
         <!--Fill expire date-->
         <switchToIFrame stepKey="switchToExpirationMonth" selector="{{NewOrderSection.monthFrame}}"/>
         <fillField stepKey="fillMonth" selector="{{NewOrderSection.expirationMonth}}" userInput="{{PaymentAndShippingInfo.month}}"/>
-        <waitForPageLoad stepKey="waitForFillMonth" time="1"/>
+        <waitForPageLoad stepKey="waitForFillMonth"/>
         <switchToIFrame stepKey="switchBackFromMonth"/>
         <switchToIFrame stepKey="switchToExpirationYear" selector="{{NewOrderSection.yearFrame}}"/>
         <fillField stepKey="fillYear" selector="{{NewOrderSection.expirationYear}}" userInput="{{PaymentAndShippingInfo.year}}"/>
-        <waitForPageLoad stepKey="waitForFillYear" time="1"/>
+        <waitForPageLoad stepKey="waitForFillYear"/>
         <switchToIFrame stepKey="switchBackFromYear"/>
 
         <!--Fill CVW code-->

app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml

@@ -65,7 +65,7 @@
         <actionGroup ref="StorefrontFillCartDataActionGroup" stepKey="StorefrontFillCartDataActionGroup"/>
         <waitForPageLoad stepKey="waitForPageLoad4"/>
         <!--Place order-->
-        <click selector="{{CheckoutPaymentSection.placeOrder}}"
+        <click selector="{{BraintreeConfigurationPaymentSection.paymentMethodContainer}}{{CheckoutPaymentSection.placeOrder}}"
                stepKey="PlaceOrder"/>
         <waitForPageLoad stepKey="waitForPageLoad5"/>
 

app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml

@@ -11,7 +11,7 @@
     <test name="CreateAdminOrderPayedWithOnlinePaymentIncludingTaxAndDiscount">
         <annotations>
             <features value="Braintree"/>
-            <stories value="Get access to a New Credit Memo Page from Invocie for Order payed with online payment via Admin"/>
+            <stories value="Get access to a New Credit Memo Page from Invoice for Order payed with online payment via Admin"/>
             <title value="Admin should be able to open a New Credit Memo Page from Invoice Page for Order with tax and discount and payed using online payment method"/>
             <description value="Admin should be able to open a New Credit Memo Page from Invoice Page for Order with tax and discount and payed using online payment method"/>
             <severity value="CRITICAL"/>
@@ -72,9 +72,9 @@
 
         <!-- Create a cart price rule with 10% discount for whole cart -->
         <click selector="{{AdminMenuSection.marketing}}" stepKey="clickOnMarketing" />
-        <waitForPageLoad stepKey="waitForMarketing" time="3"/>
+        <waitForPageLoad stepKey="waitForMarketing"/>
         <click selector="{{CartPriceRulesSubmenuSection.cartPriceRules}}" stepKey="clickOnCartPriceRules"/>
-        <waitForPageLoad stepKey="waitForCartPriceRules" time="3"/>
+        <waitForPageLoad stepKey="waitForCartPriceRules"/>
         <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
         <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
         <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
@@ -83,7 +83,7 @@
         <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Percent of product price discount" stepKey="selectActionType"/>
         <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="10" stepKey="fillDiscountAmount"/>
         <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForCartRuleLoad" time="3"/>
+        <waitForPageLoad stepKey="waitForCartRuleLoad"/>
         <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
 
         <!--Set Taxable Goods for Shipping Tax Class-->
@@ -112,15 +112,15 @@
 
         <!--Submit Order-->
         <click stepKey="submitOrder" selector="{{NewOrderSection.submitOrder}}"/>
-        <waitForPageLoad stepKey="waitForSubmitOrder" time="5"/>
+        <waitForPageLoad stepKey="waitForSubmitOrder"/>
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeOrderSuccessMessage" after="waitForSubmitOrder"/>
 
         <!-- Create New invoice-->
         <actionGroup ref="adminFastCreateInvoice" stepKey="createInvoice"/>
 
         <!--Get access to Credit Memo page from Invoice page-->
         <click selector="{{AdminInvoiceMainActionsSection.openNewCreditMemoFromInvoice}}" stepKey="clickCreateNewCreditMemo"/>
-        <waitForPageLoad stepKey="waitForLoadNewCreditMemoPage" time="5"/>
+        <waitForPageLoad stepKey="waitForLoadNewCreditMemoPage"/>
         <see selector="{{AdminCreditMemoOrderInformationSection.orderStatus}}" userInput="Processing" stepKey="seeNewCreditMemo"/>
     </test>
-</tests>
+</tests>

app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php

@@ -6,6 +6,16 @@
  */
 namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
 
-class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product\Crosssell
+use Magento\Catalog\Controller\Adminhtml\Product\Crosssell as CatalogCrossel;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Crosssell
+ *
+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
+ * @deprecated Not used since cross-sell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
+ */
+class Crosssell extends CatalogCrossel implements HttpPostActionInterface
 {
 }

app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php

@@ -6,6 +6,16 @@
  */
 namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
 
-class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid
+use Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid as CatalogCrosssellGrid;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class CrosssellGrid
+ *
+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
+ * @deprecated Not used since cross-sell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml
+ */
+class CrosssellGrid extends CatalogCrosssellGrid implements HttpPostActionInterface
 {
 }

app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php

@@ -6,6 +6,16 @@
  */
 namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
 
-class Related extends \Magento\Catalog\Controller\Adminhtml\Product\Related
+use Magento\Catalog\Controller\Adminhtml\Product\Related as CatalogRelated;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Related
+ *
+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
+ * @deprecated Not used since related products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
+ */
+class Related extends CatalogRelated implements HttpPostActionInterface
 {
 }

app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php

@@ -6,6 +6,16 @@
  */
 namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
 
-class RelatedGrid extends \Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid
+use Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid as CatalogRelatedGrid;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class RelatedGrid
+ *
+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
+ * @deprecated Not used since related products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml
+ */
+class RelatedGrid extends CatalogRelatedGrid implements HttpPostActionInterface
 {
 }

app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php

@@ -6,6 +6,16 @@
  */
 namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit;
 
-class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product\Upsell
+use Magento\Catalog\Controller\Adminhtml\Product\Upsell as CatalogUpsell;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class Upsell
+ *
+ * @package Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit
+ * @deprecated Not used since upsell products grid moved to UI components.
+ * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml
+ */
+class Upsell extends CatalogUpsell implements HttpPostActionInterface
 {
 }