🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - #15607: [Forwardport] Issue 15469: Javascript error dropdowns.js (by @dmytro-ch)
 - #15577: [Forwardport] set alignment purchase order form and place order button (by @osrecio)
 - #15498: Missing PHPDoc comment (by @lfluvisotto)
 - #15200: [Port 2.3-develop] Don't recalculate tax for every price on category page (by @JeroenVanLeusden)


Fixed GitHub Issues:
 - #15469: lib/web/mage/dropdowns.js fails when autoclose is set to true (reported by @brian-labelle) has been fixed in #15607 by @dmytro-ch in 2.3-develop branch
   Related commits:
     1. 1e2019c

 - #15334: Purchased Order Form button should visible properly (reported by @neeta-wagento) has been fixed in #15577 by @osrecio in 2.3-develop branch
   Related commits:
     1. 751c3e6
     2. fb0f192

 - #14941: Unnecessary recalculation of product list pricing causes huge slowdowns (reported by @paales) has been fixed in #15200 by @JeroenVanLeusden in 2.3-develop branch
   Related commits:
     1. 08cf8b8

Author: magento-engcom-team

app/code/Magento/CatalogGraphQl/Model/Layer/CollectionProvider.php

@@ -29,6 +29,10 @@ class CollectionProvider implements \Magento\Catalog\Model\Layer\ItemCollectionP
      */
     private $collectionProcessor;
 
+    /**
+     * @param \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface $collectionProcessor
+     * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory
+     */
     public function __construct(
         \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface $collectionProcessor,
         \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory

app/code/Magento/NewRelicReporting/Model/Observer/ReportApplicationHandledExceptionToNewRelic.php

@@ -37,6 +37,9 @@ public function __construct(
         $this->newRelicWrapper = $newRelicWrapper;
     }
 
+    /**
+     * @param Observer $observer
+     */
     public function execute(Observer $observer)
     {
         if ($this->config->isNewRelicEnabled()) {

app/code/Magento/Sales/Setup/SalesSetup.php

@@ -303,6 +303,9 @@ public function getEncryptor()
         return $this->encryptor;
     }
 
+    /**
+     * @return \Magento\Framework\DB\Adapter\AdapterInterface
+     */
     public function getConnection()
     {
         return $this->getSetup()->getConnection(self::$connectionName);

app/code/Magento/Tax/Model/Config.php

@@ -832,20 +832,20 @@ public function getInfoUrl($store = null)
      * If it necessary will be returned conversion type (minus or plus)
      *
      * @param null|int|string|Store $store
-     * @return bool
+     * @return bool|int
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function needPriceConversion($store = null)
     {
-        $res = false;
+        $res = 0;
         $priceIncludesTax = $this->priceIncludesTax($store) || $this->getNeedUseShippingExcludeTax();
         if ($priceIncludesTax) {
             switch ($this->getPriceDisplayType($store)) {
                 case self::DISPLAY_TYPE_EXCLUDING_TAX:
                 case self::DISPLAY_TYPE_BOTH:
                     return self::PRICE_CONVERSION_MINUS;
                 case self::DISPLAY_TYPE_INCLUDING_TAX:
-                    $res = true;
+                    $res = false;
                     break;
                 default:
                     break;

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less

@@ -46,6 +46,11 @@
                     .lib-css(border-top, @checkout-payment-method-title__border);
                 }
             }
+            form {
+                &.form-purchase-order {
+                    margin-bottom: 15px;
+                }
+            }
         }
 
         .payment-method-content {

lib/internal/Magento/Framework/Exception/AbstractAggregateException.php

@@ -78,6 +78,10 @@ public function addError(Phrase $phrase)
         return $this;
     }
 
+    /**
+     * @param LocalizedException $exception
+     * @return $this
+     */
     public function addException(LocalizedException $exception)
     {
         $this->addErrorCalls++;

lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/Filter/Operator.php

@@ -65,7 +65,7 @@ public static function getOperators() : array
         return $type->getConstants();
     }
 
-    /*
+    /**
      * Convert operator to string
      *
      * @return string

lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessor/SimpleConstructor.php

@@ -19,6 +19,10 @@ class SimpleConstructor
      */
     private $name;
 
+    /**
+     * @param int $entityId
+     * @param string $name
+     */
     public function __construct(
         int $entityId,
         string $name

lib/web/mage/dropdowns.js

@@ -127,11 +127,9 @@ define([
             }
 
             elem.on('click.toggleDropdown', function () {
-                var el;
+                var el = actionElem;
 
                 if (options.autoclose === true) {
-                    el = actionElem;
-
                     actionElem = $();
                     $(document).trigger('click.hideDropdown');
                     actionElem = el;

setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php

@@ -157,6 +157,10 @@ private function clearChangelog()
         }
     }
 
+    /**
+     * @param \Magento\Setup\Fixtures\Fixture $fixture
+     * @param OutputInterface $output
+     */
     private function executeFixture(\Magento\Setup\Fixtures\Fixture $fixture, OutputInterface $output)
     {
         $output->write('<info>' . $fixture->getActionTitle() . '... </info>');