Skip to content

Commit c4d8db2

Browse files
andimovandimov
committed
Merge remote-tracking branch 'performance/application-server' into ACPT-1052-part2
2 parents 885c9e0 + e3796ac commit c4d8db2

File tree

100 files changed

+16703
-14579
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+16703
-14579
lines changed

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@
2727
<waitForPageLoad stepKey="waitForTaxRateLoad"/>
2828

2929
<!-- delete the rule -->
30+
<waitForElementVisible selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="waitForDelete"/>
3031
<click stepKey="clickDelete" selector="{{AdminStoresMainActionsSection.deleteButton}}"/>
32+
<waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForConfirmationModal"/>
3133
<click stepKey="clickOk" selector="{{AdminConfirmationModalSection.ok}}"/>
32-
<see stepKey="seeSuccess" selector="{{AdminMessagesSection.success}}" userInput="deleted"/>
34+
<waitForText stepKey="seeSuccess" selector="{{AdminMessagesSection.success}}" userInput="deleted"/>
3335
</actionGroup>
3436
</actionGroups>

‎app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,8 @@ protected function getSelectionAmounts(Product $bundleProduct, $searchMin, $useR
215215
* @param Option $option
216216
* @param bool $canSkipRequiredOption
217217
* @return bool
218-
* @deprecated 100.2.0
218+
* @deprecated 100.2.0 Not used anymore.
219+
* @see Nothing
219220
*/
220221
protected function canSkipOption($option, $canSkipRequiredOption)
221222
{
@@ -227,7 +228,8 @@ protected function canSkipOption($option, $canSkipRequiredOption)
227228
*
228229
* @param Product $bundleProduct
229230
* @return bool
230-
* @deprecated 100.2.0
231+
* @deprecated 100.2.0 Not used anymore.
232+
* @see Nothing
231233
*/
232234
protected function hasRequiredOption($bundleProduct)
233235
{
@@ -246,6 +248,7 @@ function ($item) {
246248
* @param Product $saleableItem
247249
* @return \Magento\Bundle\Model\ResourceModel\Option\Collection
248250
* @deprecated 100.2.0
251+
* @see Nothing
249252
*/
250253
protected function getBundleOptions(Product $saleableItem)
251254
{

‎app/code/Magento/Bundle/Pricing/Price/BundleOptions.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ public function calculateOptions(
9292
/** @var \Magento\Bundle\Pricing\Price\BundleSelectionPrice $selectionPriceList */
9393
$selectionPriceList = $this->calculator->createSelectionPriceList($option, $bundleProduct);
9494
$selectionPriceList = $this->calculator->processOptions($option, $selectionPriceList, $searchMin);
95+
// phpcs:ignore Magento2.Performance.ForeachArrayMerge
9596
$priceList = array_merge($priceList, $selectionPriceList);
9697
}
9798
$amount = $this->calculator->calculateBundleAmount(0., $bundleProduct, $priceList);

‎app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace Magento\Bundle\Pricing\Price;
88

99
use Magento\Bundle\Pricing\Adjustment\BundleCalculatorInterface;
10+
use Magento\Catalog\Pricing\Price\RegularPrice;
1011
use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
1112
use Magento\Framework\Pricing\Amount\AmountInterface;
1213
use Magento\Catalog\Pricing\Price\CustomOptionPrice;
@@ -15,7 +16,7 @@
1516
/**
1617
* Bundle product regular price model
1718
*/
18-
class BundleRegularPrice extends \Magento\Catalog\Pricing\Price\RegularPrice implements RegularPriceInterface, ResetAfterRequestInterface
19+
class BundleRegularPrice extends RegularPrice implements RegularPriceInterface, ResetAfterRequestInterface
1920
{
2021
/**
2122
* @var BundleCalculatorInterface

‎app/code/Magento/BundleGraphQl/Model/Resolver/BundleItems.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ public function __construct(
5858
}
5959

6060
/**
61-
* Fetch and format bundle option items.
62-
*
6361
* @inheritDoc
6462
*/
6563
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)

‎app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
2626
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2727
*/
28-
class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
29-
implements ResetAfterRequestInterface
28+
class Bundle extends \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType implements
29+
ResetAfterRequestInterface
3030
{
3131
/**
3232
* Delimiter before product option value.
@@ -796,6 +796,4 @@ public function _resetState(): void
796796
$this->_cachedOptionSelectQuery = [];
797797
$this->_cachedSkuToProducts = [];
798798
}
799-
800-
801799
}

‎app/code/Magento/Catalog/Helper/Category.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
*/
2020
class Category extends AbstractHelper implements ResetAfterRequestInterface
2121
{
22-
const XML_PATH_USE_CATEGORY_CANONICAL_TAG = 'catalog/seo/category_canonical_tag';
22+
public const XML_PATH_USE_CATEGORY_CANONICAL_TAG = 'catalog/seo/category_canonical_tag';
2323

24-
const XML_PATH_CATEGORY_ROOT_ID = 'catalog/category/root_id';
24+
public const XML_PATH_CATEGORY_ROOT_ID = 'catalog/category/root_id';
2525

2626
/**
2727
* Store categories cache
@@ -31,14 +31,14 @@ class Category extends AbstractHelper implements ResetAfterRequestInterface
3131
protected $_storeCategories = [];
3232

3333
/**
34-
* Store manager
34+
* Store manager instance
3535
*
3636
* @var \Magento\Store\Model\StoreManagerInterface
3737
*/
3838
protected $_storeManager;
3939

4040
/**
41-
* Category factory
41+
* Category factory instance
4242
*
4343
* @var \Magento\Catalog\Model\CategoryFactory
4444
*/

‎app/code/Magento/Catalog/Model/Layer/FilterList.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
*/
1717
class FilterList implements ResetAfterRequestInterface
1818
{
19-
const CATEGORY_FILTER = 'category';
20-
const ATTRIBUTE_FILTER = 'attribute';
21-
const PRICE_FILTER = 'price';
22-
const DECIMAL_FILTER = 'decimal';
19+
public const CATEGORY_FILTER = 'category';
20+
public const ATTRIBUTE_FILTER = 'attribute';
21+
public const PRICE_FILTER = 'price';
22+
public const DECIMAL_FILTER = 'decimal';
2323

2424
/**
2525
* Filter factory

‎app/code/Magento/Catalog/Model/Product/Option/Type/File/RequestAwareValidatorFile.php

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,15 @@
77

88
namespace Magento\Catalog\Model\Product\Option\Type\File;
99

10+
use Magento\Framework\App\Config\ScopeConfigInterface;
1011
use Magento\Framework\App\ObjectManager;
1112
use Magento\Framework\App\Request\Http as Request;
13+
use Magento\Framework\Exception\FileSystemException;
14+
use Magento\Framework\File\Size;
15+
use Magento\Framework\Filesystem;
16+
use Magento\Framework\HTTP\Adapter\FileTransferFactory;
1217
use Magento\Framework\Math\Random;
18+
use Magento\Framework\Validator\File\IsImage;
1319

1420
/**
1521
* Request Aware Validator to replace use of $_SERVER super global.
@@ -24,21 +30,21 @@ class RequestAwareValidatorFile extends ValidatorFile
2430
/**
2531
* Constructor method
2632
*
27-
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
28-
* @param \Magento\Framework\Filesystem $filesystem
29-
* @param \Magento\Framework\File\Size $fileSize
30-
* @param \Magento\Framework\HTTP\Adapter\FileTransferFactory $httpFactory
31-
* @param \Magento\Framework\Validator\File\IsImage $isImageValidator
33+
* @param ScopeConfigInterface $scopeConfig
34+
* @param Filesystem $filesystem
35+
* @param Size $fileSize
36+
* @param FileTransferFactory $httpFactory
37+
* @param IsImage $isImageValidator
3238
* @param Random|null $random
3339
* @param Request|null $request
34-
* @throws \Magento\Framework\Exception\FileSystemException
40+
* @throws FileSystemException
3541
*/
3642
public function __construct(
37-
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
38-
\Magento\Framework\Filesystem $filesystem,
39-
\Magento\Framework\File\Size $fileSize,
40-
\Magento\Framework\HTTP\Adapter\FileTransferFactory $httpFactory,
41-
\Magento\Framework\Validator\File\IsImage $isImageValidator,
43+
ScopeConfigInterface $scopeConfig,
44+
Filesystem $filesystem,
45+
Size $fileSize,
46+
FileTransferFactory $httpFactory,
47+
IsImage $isImageValidator,
4248
Random $random = null,
4349
Request $request = null
4450
) {

‎app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/AttributeOptionProvider.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public function getOptions(array $optionIds, ?int $storeId, array $attributeCode
6363
'attribute_id' => 'a.attribute_id',
6464
'attribute_code' => 'a.attribute_code',
6565
'attribute_label' => 'a.frontend_label',
66+
'attribute_type' => 'a.frontend_input',
6667
'position' => 'attribute_configuration.position'
6768
]
6869
)
@@ -137,6 +138,7 @@ private function formatResult(Select $select): array
137138
'attribute_code' => $option['attribute_code'],
138139
'attribute_label' => $option['attribute_store_label']
139140
? $option['attribute_store_label'] : $option['attribute_label'],
141+
'attribute_type' => $option['attribute_type'],
140142
'position' => $option['position'],
141143
'options' => [],
142144
];

0 commit comments

Comments
 (0)