merge magento/2.3-develop into magento-pangolin/community-tests-migra…

…tion-pr
YevSent · May 10, 2019 · f2f7631 · f2f7631
2 parents f7b8480 + f7cc333
commit f2f7631
Show file tree

Hide file tree

Showing 28 changed files with 202 additions and 103 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -35,4 +35,4 @@
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
  - [ ] All new or changed code is covered with unit/integration tests (if applicable)
- - [ ] All automated tests passed successfully (all builds on Travis CI are green)
+ - [ ] All automated tests passed successfully (all builds are green)
diff --git a/.travis.yml → .travis.yml.sample b/.travis.yml → .travis.yml.sample
diff --git a/README.md b/README.md
@@ -1,4 +1,3 @@
-[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.3-develop)](https://travis-ci.org/magento/magento2)
 [![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg)](https://crowdin.com/project/magento-2)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
@@ -15,8 +15,9 @@
 use Magento\Catalog\Pricing\Price\CustomOptionPriceInterface;
 
 /**
- * Product aoptions section abstract block.
+ * Product options section abstract block.
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @since 100.0.2
  */

diff --git a/...de/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/...de/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
@@ -46,6 +46,8 @@ public function prepareProductAttributes(Product $product, array $productData, a
     }
 
     /**
+     * Reset "Use Config Settings" to false in product data.
+     *
      * @param Product $product
      * @param string $attributeCode
      * @param array $productData
@@ -62,6 +64,8 @@ private function prepareConfigData(Product $product, string $attributeCode, arra
     }
 
     /**
+     * Prepare default attribute data for product.
+     *
      * @param array $attributeList
      * @param string $attributeCode
      * @param array $productData
@@ -73,7 +77,7 @@ private function prepareDefaultData(array $attributeList, string $attributeCode,
             /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
             $attribute = $attributeList[$attributeCode];
             $attributeType = $attribute->getBackendType();
-            // For non-numberic types set the attributeValue to 'false' to trigger their removal from the db
+            // For non-numeric types set the attributeValue to 'false' to trigger their removal from the db
             if ($attributeType === 'varchar' || $attributeType === 'text' || $attributeType === 'datetime') {
                 $attribute->setIsRequired(false);
                 $productData[$attributeCode] = false;
@@ -86,6 +90,8 @@ private function prepareDefaultData(array $attributeList, string $attributeCode,
     }
 
     /**
+     * Check, whether attribute should not be updated.
+     *
      * @param Product $product
      * @param array $useDefaults
      * @param string $attribute

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -807,7 +807,7 @@ public function load($printQuery = false, $logQuery = false)
     }
 
     /**
-     * Processs adding product website names to result collection
+     * Process adding product website names to result collection
      *
      * @return $this
      */

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml
@@ -96,7 +96,7 @@
     <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
     <see selector="{{AdminCategoryBasicFieldSection.FieldError('uid')}}" userInput="This is a required field." stepKey="seeErrorMessage"/>
     <!-- Verify that the Layered navigation price step field has the required indicator -->
-    <comment userInput="Check if Layered navigation price field has required indictor icon" stepKey="comment" />
+    <comment userInput="Check if Layered navigation price field has required indicator icon" stepKey="comment" />
     <executeJS function="{{CategoryDisplaySettingsSection.RequiredFieldIndicator('filter_price_range')}}" stepKey="getRequiredFieldIndicator"/>
     <assertEquals expected='"*"' expectedType="string" actualType="variable" actual="getRequiredFieldIndicator" message="pass" stepKey="assertRequiredFieldIndicator1"/>
     </test>

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
@@ -45,11 +45,11 @@ function checkOptionsPanelVisibility(){
 
         if($('frontend_input') && ($('frontend_input').value=='select' || $('frontend_input').value=='multiselect')){
             panel.show();
-            panel.addClass(activePanelClass);
+            jQuery(panel).addClass(activePanelClass);
         }
         else {
             panel.hide();
-            panel.removeClass(activePanelClass);
+            jQuery(panel).removeClass(activePanelClass);
         }
     }
 }

diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml
@@ -49,9 +49,9 @@
         <waitForLoadingMaskToDisappear stepKey="waitForPageLoad3"/>
         <!--see Insert Variable button disabled-->
         <see selector="{{VariableSection.InsertVariableBtnDisabled}}" userInput="Insert Variable" stepKey="seeInsertWidgetDisabled" />
-        <!--see Cancel button enabed-->
+        <!--see Cancel button enabled-->
         <see selector="{{VariableSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-        <!--see 4 colums-->
+        <!--see 4 columns-->
         <see selector="{{VariableSection.ColName('Select')}}" userInput="Select" stepKey="selectCol" />
         <see selector="{{VariableSection.ColName('Variable Name')}}" userInput="Variable Name" stepKey="variableCol" />
         <see selector="{{VariableSection.ColName('Type')}}" userInput="Type" stepKey="typeCol" />

diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml
@@ -43,9 +43,9 @@
         <waitForText userInput="Insert Variable" stepKey="waitForSlideOutOpen"/>
         <!--see Insert Variable button disabled-->
         <see selector="{{VariableSection.InsertVariableBtnDisabled}}" userInput="Insert Variable" stepKey="seeInsertWidgetDisabled" />
-        <!--see Cancel button enabed-->
+        <!--see Cancel button enabled-->
         <see selector="{{VariableSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-        <!--see 4 colums-->
+        <!--see 4 columns-->
         <see selector="{{VariableSection.ColName('Select')}}" userInput="Select" stepKey="selectCol" />
         <see selector="{{VariableSection.ColName('Variable Name')}}" userInput="Variable Name" stepKey="variableCol" />
         <see selector="{{VariableSection.ColName('Type')}}" userInput="Type" stepKey="typeCol" />

diff --git a/...ode/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml b/...ode/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
@@ -37,7 +37,7 @@
         <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
         <!--see Insert Widget button disabled-->
         <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-        <!--see Cancel button enabed-->
+        <!--see Cancel button enabled-->
         <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
         <!--Select "Widget Type"-->
         <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Category Link" stepKey="selectCatalogCategoryLink" />

diff --git a/...code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml b/...code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
@@ -41,7 +41,7 @@
         <waitForPageLoad stepKey="wait3"/>
         <!--see Insert Widget button disabled-->
         <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-        <!--see Cancel button enabed-->
+        <!--see Cancel button enabled-->
         <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
         <!--Select "Widget Type"-->
         <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Product Link" stepKey="selectCatalogProductLink" />

diff --git a/...e/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php b/...e/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Catalog super product attribute resource model
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -11,6 +9,9 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Store\Model\Store;
 
+/**
+ * Catalog super product attribute resource model.
+ */
 class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
@@ -52,7 +53,7 @@ public function __construct(
     }
 
     /**
-     * Inititalize connection and define tables
+     * Initialize connection and define tables
      *
      * @return void
      */
@@ -189,8 +190,7 @@ public function deleteAttributesByProductId($productId)
     }
 
     /**
-     * @param \Magento\Framework\Model\AbstractModel $object
-     * @return $this
+     * @inheritDoc
      */
     protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
     {

diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -375,6 +375,8 @@ public function getRegion()
             }
         } elseif (is_string($region)) {
             $this->setData('region', $region);
+        } elseif (!$regionId && is_array($region)) {
+            $this->setData('region', $regionId);
         }
 
         return $this->getData('region');

diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml
@@ -11,11 +11,11 @@
     <test name="ShopByButtonInMobile">
         <annotations>
             <features value="Layered Navigation"/>
-            <stories value="Shop By button is not working in a mobile theme"/>
-            <title value="Layered Navigation"/>
-            <description value="Storefront Shop By collapsible button works in a mobile theme"/>
+            <stories value="Storefront Shop By collapsible button in mobile themes"/>
+            <title value="Storefront Shop By collapsible button works in a mobile theme"/>
+            <description value="Storefront Shop By collapsible button should work in a mobile theme"/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-94873"/>
+            <testCaseId value="MC-6092"/>
             <group value="LayeredNavigation"/>
         </annotations>
         <before>

diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml
@@ -49,9 +49,9 @@
         <waitForLoadingMaskToDisappear stepKey="waitForPageLoad3"/>
         <!--see Insert Variable button disabled-->
         <see selector="{{VariableSection.InsertVariableBtnDisabled}}" userInput="Insert Variable" stepKey="seeInsertWidgetDisabled" />
-        <!--see Cancel button enabed-->
+        <!--see Cancel button enabled-->
         <see selector="{{VariableSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-        <!--see 4 colums-->
+        <!--see 4 columns-->
         <see selector="{{VariableSection.ColName('Select')}}" userInput="Select" stepKey="selectCol" />
         <see selector="{{VariableSection.ColName('Variable Name')}}" userInput="Variable Name" stepKey="variableCol" />
         <see selector="{{VariableSection.ColName('Type')}}" userInput="Type" stepKey="typeCol" />

diff --git a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
@@ -109,8 +109,8 @@ public function testGetValue($key, $method, $returnMap, $expectedValue)
 
     /**
      *
-     * @case #1 This conf parameters must return AbstractConfig::PAYMENT_ACTION_SALE (isWppApiAvailabe == false)
-     * @case #2 This conf parameters must return configValue (isWppApiAvailabe == true)
+     * @case #1 This conf parameters must return AbstractConfig::PAYMENT_ACTION_SALE (isWppApiAvailable == false)
+     * @case #2 This conf parameters must return configValue (isWppApiAvailable == true)
      * @case #3 This conf parameters must return configValue ($key != 'payment_action')
      * @case #4 This conf parameters must return configValue (configValue == 'Sale')
      * @case #5 This conf parameters must return configValue (shouldUseUnilateralPayments == false)

diff --git a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
@@ -7,8 +7,11 @@
 
 /**
  * Reports Product Index Abstract Model
+ *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
 {
@@ -156,7 +159,7 @@ public function getStoreId()
     }
 
     /**
-     * On customer loggin merge visitor/customer index
+     * On customer login merge visitor/customer index
      *
      * @return $this
      */

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
@@ -8,7 +8,7 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
- * Credit memo adjustmets block
+ * Credit memo adjustments block
  *
  * @api
  * @since 100.0.2
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         /**
-         * Processs adding product website names to result collection
+         * Process adding product website names to result collection
          *
          * @return $this
          */
@@ Expand Down @@