Skip to content

Commit c2b4657

Browse files
🔃 [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
2 parents 06d21ec + 2f85d6e commit c2b4657

File tree

11 files changed

+36
-7
lines changed

11 files changed

+36
-7
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ class CollectionProvider implements \Magento\Catalog\Model\Layer\ItemCollectionP
2929
*/
3030
private $collectionProcessor;
3131

32+
/**
33+
* @param \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface $collectionProcessor
34+
* @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory
35+
*/
3236
public function __construct(
3337
\Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface $collectionProcessor,
3438
\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public function __construct(
3737
$this->newRelicWrapper = $newRelicWrapper;
3838
}
3939

40+
/**
41+
* @param Observer $observer
42+
*/
4043
public function execute(Observer $observer)
4144
{
4245
if ($this->config->isNewRelicEnabled()) {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,9 @@ public function getEncryptor()
303303
return $this->encryptor;
304304
}
305305

306+
/**
307+
* @return \Magento\Framework\DB\Adapter\AdapterInterface
308+
*/
306309
public function getConnection()
307310
{
308311
return $this->getSetup()->getConnection(self::$connectionName);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -832,20 +832,20 @@ public function getInfoUrl($store = null)
832832
* If it necessary will be returned conversion type (minus or plus)
833833
*
834834
* @param null|int|string|Store $store
835-
* @return bool
835+
* @return bool|int
836836
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
837837
*/
838838
public function needPriceConversion($store = null)
839839
{
840-
$res = false;
840+
$res = 0;
841841
$priceIncludesTax = $this->priceIncludesTax($store) || $this->getNeedUseShippingExcludeTax();
842842
if ($priceIncludesTax) {
843843
switch ($this->getPriceDisplayType($store)) {
844844
case self::DISPLAY_TYPE_EXCLUDING_TAX:
845845
case self::DISPLAY_TYPE_BOTH:
846846
return self::PRICE_CONVERSION_MINUS;
847847
case self::DISPLAY_TYPE_INCLUDING_TAX:
848-
$res = true;
848+
$res = false;
849849
break;
850850
default:
851851
break;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@
4646
.lib-css(border-top, @checkout-payment-method-title__border);
4747
}
4848
}
49+
form {
50+
&.form-purchase-order {
51+
margin-bottom: 15px;
52+
}
53+
}
4954
}
5055

5156
.payment-method-content {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ public function addError(Phrase $phrase)
7878
return $this;
7979
}
8080

81+
/**
82+
* @param LocalizedException $exception
83+
* @return $this
84+
*/
8185
public function addException(LocalizedException $exception)
8286
{
8387
$this->addErrorCalls++;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static function getOperators() : array
6565
return $type->getConstants();
6666
}
6767

68-
/*
68+
/**
6969
* Convert operator to string
7070
*
7171
* @return string

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ class SimpleConstructor
1919
*/
2020
private $name;
2121

22+
/**
23+
* @param int $entityId
24+
* @param string $name
25+
*/
2226
public function __construct(
2327
int $entityId,
2428
string $name

lib/web/mage/dropdowns.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,9 @@ define([
127127
}
128128

129129
elem.on('click.toggleDropdown', function () {
130-
var el;
130+
var el = actionElem;
131131

132132
if (options.autoclose === true) {
133-
el = actionElem;
134-
135133
actionElem = $();
136134
$(document).trigger('click.hideDropdown');
137135
actionElem = el;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,10 @@ private function clearChangelog()
157157
}
158158
}
159159

160+
/**
161+
* @param \Magento\Setup\Fixtures\Fixture $fixture
162+
* @param OutputInterface $output
163+
*/
160164
private function executeFixture(\Magento\Setup\Fixtures\Fixture $fixture, OutputInterface $output)
161165
{
162166
$output->write('<info>' . $fixture->getActionTitle() . '... </info>');

setup/src/Magento/Setup/Console/Style/MagentoStyle.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,10 @@ private function autoPrependText()
518518
}
519519
}
520520

521+
/**
522+
* @param array $messages
523+
* @return array
524+
*/
521525
private function reduceBuffer($messages)
522526
{
523527
// We need to know if the two last chars are PHP_EOL

0 commit comments

Comments
 (0)