Merge branch '2.3-develop' of github.com:magento/magento2 into 2.3-de…

…velop#920
magento · Sep 27, 2019 · c92ecf8 · c92ecf8
2 parents 7d4a306 + ea71192
commit c92ecf8
Show file tree

Hide file tree

Showing 273 changed files with 8,897 additions and 2,996 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,10 @@ Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a
 
 *	[Installation Guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
 
+## Learn More About GraphQL in Magento 2
+
+* [GraphQL Developer Guide](https://devdocs.magento.com/guides/v2.3/graphql/index.html)
+
 <h2>Contributing to the Magento 2 Code Base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
 

diff --git a/app/code/Magento/AdminNotification/etc/db_schema.xml b/app/code/Magento/AdminNotification/etc/db_schema.xml
@@ -9,7 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="adminnotification_inbox" resource="default" engine="innodb" comment="Adminnotification Inbox">
         <column xsi:type="int" name="notification_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Notification id"/>
+                comment="Notification ID"/>
         <column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Problem type"/>
         <column xsi:type="timestamp" name="date_added" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
@@ -35,7 +35,7 @@
         </index>
     </table>
     <table name="admin_system_messages" resource="default" engine="innodb" comment="Admin System Messages">
-        <column xsi:type="varchar" name="identity" nullable="false" length="100" comment="Message id"/>
+        <column xsi:type="varchar" name="identity" nullable="false" length="100" comment="Message ID"/>
         <column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Problem type"/>
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"

diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\AdvancedPricingImportExport\Model\Export;
 
-use Magento\ImportExport\Model\Export;
-use Magento\Store\Model\Store;
-use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
 use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as ImportAdvancedPricing;
 use Magento\Catalog\Model\Product as CatalogProduct;
+use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
+use Magento\ImportExport\Model\Export;
+use Magento\Store\Model\Store;
 
 /**
  * Export Advanced Pricing
@@ -150,6 +150,8 @@ public function __construct(
     }
 
     /**
+     * Init type models
+     *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -172,7 +174,9 @@ protected function initTypeModels()
             }
             if ($model->isSuitable()) {
                 $this->_productTypeModels[$productTypeName] = $model;
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $this->_disabledAttrs = array_merge($this->_disabledAttrs, $model->getDisabledAttrs());
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $this->_indexValueAttributes = array_merge(
                     $this->_indexValueAttributes,
                     $model->getIndexValueAttributes()
@@ -197,6 +201,7 @@ protected function initTypeModels()
     public function export()
     {
         //Execution time may be very long
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         set_time_limit(0);
 
         $writer = $this->getWriter();
@@ -234,16 +239,6 @@ public function filterAttributeCollection(\Magento\Eav\Model\ResourceModel\Entit
 
         foreach ($collection as $attribute) {
             if (in_array($attribute->getAttributeCode(), $this->_disabledAttrs)) {
-                if (isset($this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_SKIP])) {
-                    if ($attribute->getAttributeCode() == ImportAdvancedPricing::COL_TIER_PRICE
-                        && in_array(
-                            $attribute->getId(),
-                            $this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_SKIP]
-                        )
-                    ) {
-                        $this->_passTierPrice = 1;
-                    }
-                }
                 $collection->removeItemByKey($attribute->getId());
             }
         }
@@ -363,6 +358,7 @@ private function prepareExportData(
         $linkedTierPricesData = [];
         foreach ($tierPricesData as $tierPriceData) {
             $sku = $productLinkIdToSkuMap[$tierPriceData['product_link_id']];
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $linkedTierPricesData[] = array_merge(
                 $tierPriceData,
                 [ImportAdvancedPricing::COL_SKU => $sku]
@@ -471,7 +467,7 @@ private function fetchTierPrices(array $productIds): array
             ImportAdvancedPricing::COL_TIER_PRICE_QTY => 'ap.qty',
             ImportAdvancedPricing::COL_TIER_PRICE => 'ap.value',
             ImportAdvancedPricing::COL_TIER_PRICE_PERCENTAGE_VALUE => 'ap.percentage_value',
-            'product_link_id' => 'ap.' .$productEntityLinkField,
+            'product_link_id' => 'ap.' . $productEntityLinkField,
         ];
         if ($exportFilter && array_key_exists('tier_price', $exportFilter)) {
             if (!empty($exportFilter['tier_price'][0])) {
@@ -488,7 +484,7 @@ private function fetchTierPrices(array $productIds): array
                 $selectFields
             )
             ->where(
-                'ap.'.$productEntityLinkField.' IN (?)',
+                'ap.' . $productEntityLinkField . ' IN (?)',
                 $productIds
             );
 
@@ -602,7 +598,7 @@ protected function _getWebsiteCode(int $websiteId): string
             }
 
             if ($storeName && $currencyCode) {
-                $code = $storeName.' ['.$currencyCode.']';
+                $code = $storeName . ' [' . $currencyCode . ']';
             } else {
                 $code = $storeName;
             }

diff --git a/app/code/Magento/AdvancedSearch/etc/db_schema.xml b/app/code/Magento/AdvancedSearch/etc/db_schema.xml
@@ -9,11 +9,11 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="catalogsearch_recommendations" resource="default" engine="innodb"
            comment="Advanced Search Recommendations">
-        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="ID"/>
         <column xsi:type="int" name="query_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Query Id"/>
+                default="0" comment="Query ID"/>
         <column xsi:type="int" name="relation_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Relation Id"/>
+                default="0" comment="Relation ID"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
         </constraint>

diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml
@@ -25,9 +25,9 @@
         <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>
-        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingHour}}" userInput="11" stepKey="selectAdvancedReportingHour"/>
-        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingMinute}}" userInput="11" stepKey="selectAdvancedReportingMinute"/>
-        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingSeconds}}" userInput="00" stepKey="selectAdvancedReportingSeconds"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingHour}}" userInput="23" stepKey="selectAdvancedReportingHour"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingMinute}}" userInput="59" stepKey="selectAdvancedReportingMinute"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingSeconds}}" userInput="59" stepKey="selectAdvancedReportingSeconds"/>
         <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccess"/>
     </test>

diff --git a/app/code/Magento/Authorization/Model/Role.php b/app/code/Magento/Authorization/Model/Role.php
@@ -52,6 +52,9 @@ public function __construct( //phpcs:ignore Generic.CodeAnalysis.UselessOverridi
 
     /**
      * @inheritDoc
+     *
+     * @SuppressWarnings(PHPMD.SerializationAware)
+     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -61,6 +64,9 @@ public function __sleep()
 
     /**
      * @inheritDoc
+     *
+     * @SuppressWarnings(PHPMD.SerializationAware)
+     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {