🔃 [EngCom] Public Pull Requests - 2.2-develop

magento-engcom-team · web-flow · commit 5e7bc5022e4a · 2018-09-24T19:45:06.000+03:00
Accepted Public Pull Requests: - #18126: [Backport] [2.2] Changed intval($val) to (int) $val, since it is faster: (by @dmytro-ch) - #18000: Fix sitemap grid render incorrect base urls for multiple stores (by @nntoan) - #18098: Fix shipping discount failed to apply during place order (by @torreytsui) - #18113: [Backport] Fixes from #15947 (by @ihor-sviziev) - #18097: [Backport] Fix import grouped products #12853 (by @insanityinside) - #17993: fix #17582 ./bin/magento config:show fails with a fatal error (by @keyurshah070) - #17679: Update shipment collection to unserialize `packages` attribute after load (by @dnsv) - #18055: fix: reset search mini-form when we have no data / an empty response (by @DanielRuf) - #14065: Correctly convert config integration api resources (by @therool) Fixed GitHub Issues: - #17999: Sitemap grid display incorrect base URL in the grid if using multiple stores (reported by @nntoan) has been fixed in #18000 by @nntoan in 2.2-develop branch Related commits: 1. 1172aae - #17582: ./bin/magento config:show fails with a fatal error (reported by @simonworkhouse) has been fixed in #17993 by @keyurshah070 in 2.2-develop branch Related commits: 1. ae503f6 - #12095: Update 2.2.1: One or more integrations have been reset because of a change to their xml configs. (reported by @thomvanderboon) has been fixed in #14065 by @therool in 2.2-develop branch Related commits: 1. 89a0a09 2. 5815a20 3. 406935b 4. 3868e81 5. 42eab52
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -8,13 +8,13 @@
 
 namespace Magento\Bundle\Model\Product;
 
-use Magento\Framework\App\ObjectManager;
+use Magento\Bundle\Model\ResourceModel\Selection\Collection as Selections;
+use Magento\Bundle\Model\ResourceModel\Selection\Collection\FilterApplier as SelectionCollectionFilterApplier;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Bundle\Model\ResourceModel\Selection\Collection\FilterApplier as SelectionCollectionFilterApplier;
-use Magento\Bundle\Model\ResourceModel\Selection\Collection as Selections;
 
 /**
  * Bundle Type Model
diff --git a/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php b/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
@@ -139,7 +139,7 @@ public function getCacheKeyInfo()
             [
                 $this->getDisplayType(),
                 $this->getProductsPerPage(),
-                intval($this->getRequest()->getParam($this->getData('page_var_name'), 1)),
+                (int) $this->getRequest()->getParam($this->getData('page_var_name'), 1),
                 $this->serializer->serialize($this->getRequest()->getParams())
             ]
         );
diff --git a/app/code/Magento/Catalog/Model/ImageExtractor.php b/app/code/Magento/Catalog/Model/ImageExtractor.php
@@ -36,7 +36,7 @@ public function process(\DOMElement $mediaNode, $mediaParentTag)
                     if ($attributeTagName === 'background') {
                         $nodeValue = $this->processImageBackground($attribute->nodeValue);
                     } elseif ($attributeTagName === 'width' || $attributeTagName === 'height') {
-                            $nodeValue = (int)$attribute->nodeValue;
+                        $nodeValue = (int)$attribute->nodeValue;
                     } else {
                         $nodeValue = $attribute->nodeValue;
                     }
diff --git a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
@@ -11,9 +11,9 @@
 use Magento\Catalog\Model\ProductFactory;
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\CatalogInventory\Model\Spi\StockStateProviderInterface;
+use Magento\Framework\DataObject\Factory as ObjectFactory;
 use Magento\Framework\Locale\FormatInterface;
 use Magento\Framework\Math\Division as MathDivision;
-use Magento\Framework\DataObject\Factory as ObjectFactory;
 
 /**
  * Interface StockStateProvider
diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
@@ -164,7 +164,7 @@ public function getCacheKeyInfo()
             $this->_storeManager->getStore()->getId(),
             $this->_design->getDesignTheme()->getId(),
             $this->httpContext->getValue(\Magento\Customer\Model\Context::CONTEXT_GROUP),
-            intval($this->getRequest()->getParam($this->getData('page_var_name'), 1)),
+            (int) $this->getRequest()->getParam($this->getData('page_var_name'), 1),
             $this->getProductsPerPage(),
             $conditions,
             $this->json->serialize($this->getRequest()->getParams()),
diff --git a/app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php b/app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php
@@ -97,7 +97,7 @@ public function process($scope, $scopeCode, $value, $path)
         $field = $configStructure->getElementByConfigPath($path);
 
         /** @var Value $backendModel */
-        $backendModel = $field && $field->hasBackendModel()
+        $backendModel = $field instanceof Field && $field->hasBackendModel()
             ? $field->getBackendModel()
             : $this->configValueFactory->create();
 
diff --git a/app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped.php b/app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped.php
@@ -89,7 +89,7 @@ public function saveData()
                 foreach ($associatedSkusAndQtyPairs as $associatedSkuAndQty) {
                     ++$position;
                     $associatedSkuAndQty = explode(self::SKU_QTY_DELIMITER, $associatedSkuAndQty);
-                    $associatedSku = isset($associatedSkuAndQty[0]) ? trim($associatedSkuAndQty[0]) : null;
+                    $associatedSku = isset($associatedSkuAndQty[0]) ? strtolower(trim($associatedSkuAndQty[0])) : null;
                     if (isset($newSku[$associatedSku])) {
                         $linkedProductId = $newSku[$associatedSku][$this->getProductEntityIdentifierField()];
                     } elseif (isset($oldSku[$associatedSku])) {
diff --git a/app/code/Magento/Integration/Model/Config/Consolidated/Converter.php b/app/code/Magento/Integration/Model/Config/Consolidated/Converter.php
@@ -80,9 +80,16 @@ public function convert($source)
                     $result[$integrationName][self::API_RESOURCES][] = $name;
                 }
             }
+
+            // Add root resource if any child has been added
+            if (!empty($result[$integrationName][self::API_RESOURCES])) {
+                array_unshift($result[$integrationName][self::API_RESOURCES], $allResources[1]['id']);
+            }
+
             // Remove any duplicates added parents
-            $result[$integrationName][self::API_RESOURCES] =
-                array_values(array_unique($result[$integrationName][self::API_RESOURCES]));
+            $result[$integrationName][self::API_RESOURCES] = array_values(
+                array_unique($result[$integrationName][self::API_RESOURCES])
+            );
         }
         return $result;
     }
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/acl.php b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/acl.php
@@ -6,6 +6,8 @@
 return [
     [],
     [
+        'id' => 'Magento_Backend::admin',
+        'title' => 'Magento Admin (Root)',
         'children' =>
             [
                 [
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.php b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.php
@@ -9,6 +9,7 @@
         'endpoint_url' => 'http://endpoint.com',
         'identity_link_url' => 'http://www.example.com/identity',
         'resource' => [
+            'Magento_Backend::admin',
             'Magento_Customer::manageParent',
             'Magento_Customer::manage',
             'Magento_SalesRule::quoteParent',
@@ -17,6 +18,9 @@
     ],
     'TestIntegration2' => [
         'email' => 'test-integration2@magento.com',
-        'resource' => ['Magento_Sales::sales']
+        'resource' => [
+            'Magento_Backend::admin',
+            'Magento_Sales::sales'
+        ]
     ]
 ];
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.xml b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/integration.xml
@@ -18,6 +18,7 @@
     <integration name="TestIntegration2">
         <email>test-integration2@magento.com</email>
         <resources>
+            <resource name="Magento_Backend::admin" />
             <resource name="Magento_Sales::sales" />
         </resources>
     </integration>
diff --git a/app/code/Magento/NewRelicReporting/Model/Config.php b/app/code/Magento/NewRelicReporting/Model/Config.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\NewRelicReporting\Model;
 
+/**
+ * NewRelic configuration model
+ */
 class Config
 {
     /**#@+
diff --git a/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php b/app/code/Magento/NewRelicReporting/Plugin/StatePlugin.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\NewRelicReporting\Plugin;
 
 use Magento\Framework\App\State;
@@ -11,6 +13,9 @@
 use Magento\NewRelicReporting\Model\NewRelicWrapper;
 use Psr\Log\LoggerInterface;
 
+/**
+ * Handles setting which, when enabled, reports frontend and adminhtml as separate apps to New Relic.
+ */
 class StatePlugin
 {
     /**
@@ -31,6 +36,7 @@ class StatePlugin
     /**
      * @param Config $config
      * @param NewRelicWrapper $newRelicWrapper
+     * @param LoggerInterface $logger
      */
     public function __construct(
         Config $config,
@@ -46,32 +52,33 @@ public function __construct(
      * Set separate appname
      *
      * @param State $subject
-     * @param null $result
-     * @return void
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @param mixed $result
+     * @return mixed
      */
-    public function afterSetAreaCode(State $state, $result)
+    public function afterSetAreaCode(State $subject, $result)
     {
         if (!$this->shouldSetAppName()) {
             return $result;
         }
 
         try {
-            $this->newRelicWrapper->setAppName($this->appName($state));
+            $this->newRelicWrapper->setAppName($this->appName($subject));
         } catch (LocalizedException $e) {
             $this->logger->critical($e);
             return $result;
         }
+
+        return $result;
     }
 
     /**
-     * @param State $state
+     * Format appName.
      *
+     * @param State $state
      * @return string
      * @throws LocalizedException
      */
-    private function appName(State $state)
+    private function appName(State $state): string
     {
         $code = $state->getAreaCode();
         $current = $this->config->getNewRelicAppName();
@@ -80,22 +87,16 @@ private function appName(State $state)
     }
 
     /**
+     * Check if app name should be set.
+     *
      * @return bool
      */
-    private function shouldSetAppName()
+    private function shouldSetAppName(): bool
     {
-        if (!$this->config->isNewRelicEnabled()) {
-            return false;
-        }
-
-        if (!$this->config->getNewRelicAppName()) {
-            return false;
-        }
-
-        if (!$this->config->isSeparateApps()) {
-            return false;
-        }
-
-        return true;
+        return (
+            $this->config->isSeparateApps() &&
+            $this->config->getNewRelicAppName() &&
+            $this->config->isNewRelicEnabled()
+        );
     }
 }
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php
@@ -57,14 +57,16 @@ protected function _construct()
     }
 
     /**
-     * Used to emulate after load functionality for each item without loading them
+     * Unserialize packages in each item
      *
      * @return $this
      */
     protected function _afterLoad()
     {
-        $this->walk('afterLoad');
+        foreach ($this->_items as $item) {
+            $this->getResource()->unserializeFields($item);
+        }
 
-        return $this;
+        return parent::_afterLoad();
     }
 }
diff --git a/app/code/Magento/Search/view/frontend/web/js/form-mini.js b/app/code/Magento/Search/view/frontend/web/js/form-mini.js
@@ -306,12 +306,13 @@ define([
                             dropdown.append(html);
                         });
 
+                        this._resetResponseList(true);
+
                         this.responseList.indexList = this.autoComplete.html(dropdown)
                             .css(clonePosition)
                             .show()
                             .find(this.options.responseFieldElements + ':visible');
 
-                        this._resetResponseList(false);
                         this.element.removeAttr('aria-activedescendant');
 
                         if (this.responseList.indexList.length) {
@@ -338,6 +339,11 @@ define([
                                     this._resetResponseList(false);
                                 }
                             }.bind(this));
+                    } else {
+                        this._resetResponseList(true);
+                        this.autoComplete.hide();
+                        this._updateAriaHasPopup(false);
+                        this.element.removeAttr('aria-activedescendant');
                     }
                 }, this));
             } else {
diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
@@ -62,6 +62,7 @@ public function render(\Magento\Framework\DataObject $row)
     {
         /** @var $sitemap \Magento\Sitemap\Model\Sitemap */
         $sitemap = $this->_sitemapFactory->create();
+        $sitemap->setStoreId($row->getStoreId());
         $url = $this->escapeHtml($sitemap->getSitemapUrl($row->getSitemapPath(), $row->getSitemapFilename()));
 
         $fileName = preg_replace('/^\//', '', $row->getSitemapPath() . $row->getSitemapFilename());
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
@@ -164,9 +164,8 @@ protected function clearValues(Address\Total $total)
         $total->setBaseShippingInclTax(0);
         $total->setShippingTaxAmount(0);
         $total->setBaseShippingTaxAmount(0);
-        $total->setShippingAmountForDiscount(0);
-        $total->setBaseShippingAmountForDiscount(0);
-        $total->setBaseShippingAmountForDiscount(0);
+        $total->setShippingAmountForDiscount(null);
+        $total->setBaseShippingAmountForDiscount(null);
         $total->setTotalAmount('extra_tax', 0);
         $total->setBaseTotalAmount('extra_tax', 0);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Model/Config/Consolidated/_files/integration.php b/dev/tests/integration/testsuite/Magento/Integration/Model/Config/Consolidated/_files/integration.php
@@ -9,6 +9,7 @@
         'endpoint_url' => 'http://example.com/endpoint1',
         'identity_link_url' => 'http://www.example.com/identity1',
         'resource' => [
+            'Magento_Backend::admin',
             'Magento_Customer::customer',
             'Magento_Customer::manage',
             'Magento_Sales::sales',
@@ -26,6 +27,7 @@
         'endpoint_url' => 'http://example.com/integration2',
         'identity_link_url' => 'http://www.example.com/identity2',
         'resource' => [
+            'Magento_Backend::admin',
             'Magento_Sales::sales',
             'Magento_Sales::sales_operation',
             'Magento_Sales::sales_order',
@@ -40,6 +42,7 @@
     'TestIntegration3' => [
         'email' => 'test-integration3@example.com',
         'resource' => [
+            'Magento_Backend::admin',
             'Magento_Sales::sales',
             'Magento_Sales::sales_operation',
             'Magento_Sales::sales_order',
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Model/ConfigBasedIntegrationManagerTest.php b/dev/tests/integration/testsuite/Magento/Integration/Model/ConfigBasedIntegrationManagerTest.php
diff --git a/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php b/dev/tests/integration/testsuite/Magento/NewRelicReporting/Plugin/SeparateAppsTest.php

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public function getCacheKeyInfo()`
`139`	`139`	`[`
`140`	`140`	`$this->getDisplayType(),`
`141`	`141`	`$this->getProductsPerPage(),`
`142`		`- intval($this->getRequest()->getParam($this->getData('page_var_name'), 1)),`
	`142`	`+ (int) $this->getRequest()->getParam($this->getData('page_var_name'), 1),`
`143`	`143`	`$this->serializer->serialize($this->getRequest()->getParams())`
`144`	`144`	`]`
`145`	`145`	`);`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function process(\DOMElement $mediaNode, $mediaParentTag)`
`36`	`36`	`if ($attributeTagName === 'background') {`
`37`	`37`	`$nodeValue = $this->processImageBackground($attribute->nodeValue);`
`38`	`38`	`} elseif ($attributeTagName === 'width' \|\| $attributeTagName === 'height') {`
`39`		`- $nodeValue = (int)$attribute->nodeValue;`
	`39`	`+ $nodeValue = (int)$attribute->nodeValue;`
`40`	`40`	`} else {`
`41`	`41`	`$nodeValue = $attribute->nodeValue;`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,16 @@ public function convert($source)`
`80`	`80`	`$result[$integrationName][self::API_RESOURCES][] = $name;`
`81`	`81`	`}`
`82`	`82`	`}`
	`83`	`+`
	`84`	`+ // Add root resource if any child has been added`
	`85`	`+ if (!empty($result[$integrationName][self::API_RESOURCES])) {`
	`86`	`+ array_unshift($result[$integrationName][self::API_RESOURCES], $allResources[1]['id']);`
	`87`	`+ }`
	`88`	`+`
`83`	`89`	`// Remove any duplicates added parents`
`84`		`- $result[$integrationName][self::API_RESOURCES] =`
`85`		`- array_values(array_unique($result[$integrationName][self::API_RESOURCES]));`
	`90`	`+ $result[$integrationName][self::API_RESOURCES] = array_values(`
	`91`	`+ array_unique($result[$integrationName][self::API_RESOURCES])`
	`92`	`+ );`
`86`	`93`	`}`
`87`	`94`	`return $result;`
`88`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`	`return [`
`7`	`7`	`[],`
`8`	`8`	`[`
	`9`	`+ 'id' => 'Magento_Backend::admin',`
	`10`	`+ 'title' => 'Magento Admin (Root)',`
`9`	`11`	`'children' =>`
`10`	`12`	`[`
`11`	`13`	`[`