Skip to content

Commit a50801a

Browse files
Stepa4manStepa4man
committed
Merge branch '2.3-develop' into MC-13951-Declarative-upgrade-leads-to-the-re-creation-of-indexes
2 parents 8145725 + 484cc98 commit a50801a

File tree

31 files changed

+542
-143
lines changed

31 files changed

+542
-143
lines changed

‎app/code/Magento/Catalog/Model/Category/Tree.php

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,16 @@
55
*/
66
namespace Magento\Catalog\Model\Category;
77

8+
use Magento\Catalog\Api\Data\CategoryTreeInterface;
9+
use Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory;
10+
use Magento\Catalog\Model\Category;
11+
use Magento\Catalog\Model\ResourceModel\Category\Collection;
12+
use Magento\Catalog\Model\ResourceModel\Category\TreeFactory;
13+
use Magento\Framework\App\ObjectManager;
814
use Magento\Framework\Data\Tree\Node;
15+
use Magento\Framework\Exception\LocalizedException;
16+
use Magento\Framework\Exception\NoSuchEntityException;
17+
use Magento\Store\Model\StoreManagerInterface;
918

1019
/**
1120
* Retrieve category data represented in tree structure
@@ -18,54 +27,54 @@ class Tree
1827
protected $categoryTree;
1928

2029
/**
21-
* @var \Magento\Store\Model\StoreManagerInterface
30+
* @var StoreManagerInterface
2231
*/
2332
protected $storeManager;
2433

2534
/**
26-
* @var \Magento\Catalog\Model\ResourceModel\Category\Collection
35+
* @var Collection
2736
*/
2837
protected $categoryCollection;
2938

3039
/**
31-
* @var \Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory
40+
* @var CategoryTreeInterfaceFactory
3241
*/
3342
protected $treeFactory;
3443

3544
/**
36-
* @var \Magento\Catalog\Model\ResourceModel\Category\TreeFactory
45+
* @var TreeFactory
3746
*/
3847
private $treeResourceFactory;
3948

4049
/**
4150
* @param \Magento\Catalog\Model\ResourceModel\Category\Tree $categoryTree
42-
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
43-
* @param \Magento\Catalog\Model\ResourceModel\Category\Collection $categoryCollection
44-
* @param \Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory $treeFactory
45-
* @param \Magento\Catalog\Model\ResourceModel\Category\TreeFactory|null $treeResourceFactory
51+
* @param StoreManagerInterface $storeManager
52+
* @param Collection $categoryCollection
53+
* @param CategoryTreeInterfaceFactory $treeFactory
54+
* @param TreeFactory|null $treeResourceFactory
4655
*/
4756
public function __construct(
4857
\Magento\Catalog\Model\ResourceModel\Category\Tree $categoryTree,
49-
\Magento\Store\Model\StoreManagerInterface $storeManager,
50-
\Magento\Catalog\Model\ResourceModel\Category\Collection $categoryCollection,
51-
\Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory $treeFactory,
52-
\Magento\Catalog\Model\ResourceModel\Category\TreeFactory $treeResourceFactory = null
58+
StoreManagerInterface $storeManager,
59+
Collection $categoryCollection,
60+
CategoryTreeInterfaceFactory $treeFactory,
61+
TreeFactory $treeResourceFactory = null
5362
) {
5463
$this->categoryTree = $categoryTree;
5564
$this->storeManager = $storeManager;
5665
$this->categoryCollection = $categoryCollection;
5766
$this->treeFactory = $treeFactory;
58-
$this->treeResourceFactory = $treeResourceFactory ?? \Magento\Framework\App\ObjectManager::getInstance()
59-
->get(\Magento\Catalog\Model\ResourceModel\Category\TreeFactory::class);
67+
$this->treeResourceFactory = $treeResourceFactory ?? ObjectManager::getInstance()
68+
->get(TreeFactory::class);
6069
}
6170

6271
/**
6372
* Get root node by category.
6473
*
65-
* @param \Magento\Catalog\Model\Category|null $category
74+
* @param Category|null $category
6675
* @return Node|null
67-
* @throws \Magento\Framework\Exception\LocalizedException
68-
* @throws \Magento\Framework\Exception\NoSuchEntityException
76+
* @throws LocalizedException
77+
* @throws NoSuchEntityException
6978
*/
7079
public function getRootNode($category = null)
7180
{
@@ -86,28 +95,28 @@ public function getRootNode($category = null)
8695
/**
8796
* Get node by category.
8897
*
89-
* @param \Magento\Catalog\Model\Category $category
98+
* @param Category $category
9099
* @return Node
91-
* @throws \Magento\Framework\Exception\LocalizedException
92-
* @throws \Magento\Framework\Exception\NoSuchEntityException
100+
* @throws LocalizedException
101+
* @throws NoSuchEntityException
93102
*/
94-
protected function getNode(\Magento\Catalog\Model\Category $category)
103+
protected function getNode(Category $category)
95104
{
96105
$nodeId = $category->getId();
97106
$categoryTree = $this->treeResourceFactory->create();
98107
$node = $categoryTree->loadNode($nodeId);
99108
$node->loadChildren();
100109
$this->prepareCollection();
101-
$this->categoryTree->addCollectionData($this->categoryCollection);
110+
$categoryTree->addCollectionData($this->categoryCollection);
102111
return $node;
103112
}
104113

105114
/**
106115
* Prepare category collection.
107116
*
108117
* @return void
109-
* @throws \Magento\Framework\Exception\LocalizedException
110-
* @throws \Magento\Framework\Exception\NoSuchEntityException
118+
* @throws LocalizedException
119+
* @throws NoSuchEntityException
111120
*/
112121
protected function prepareCollection()
113122
{
@@ -128,16 +137,16 @@ protected function prepareCollection()
128137
/**
129138
* Get tree by node.
130139
*
131-
* @param \Magento\Framework\Data\Tree\Node $node
140+
* @param Node $node
132141
* @param int $depth
133142
* @param int $currentLevel
134-
* @return \Magento\Catalog\Api\Data\CategoryTreeInterface
143+
* @return CategoryTreeInterface
135144
*/
136145
public function getTree($node, $depth = null, $currentLevel = 0)
137146
{
138-
/** @var \Magento\Catalog\Api\Data\CategoryTreeInterface[] $children */
147+
/** @var CategoryTreeInterface[] $children */
139148
$children = $this->getChildren($node, $depth, $currentLevel);
140-
/** @var \Magento\Catalog\Api\Data\CategoryTreeInterface $tree */
149+
/** @var CategoryTreeInterface $tree */
141150
$tree = $this->treeFactory->create();
142151
$tree->setId($node->getId())
143152
->setParentId($node->getParentId())
@@ -153,10 +162,10 @@ public function getTree($node, $depth = null, $currentLevel = 0)
153162
/**
154163
* Get node children.
155164
*
156-
* @param \Magento\Framework\Data\Tree\Node $node
165+
* @param Node $node
157166
* @param int $depth
158167
* @param int $currentLevel
159-
* @return \Magento\Catalog\Api\Data\CategoryTreeInterface[]|[]
168+
* @return CategoryTreeInterface[]|[]
160169
*/
161170
protected function getChildren($node, $depth, $currentLevel)
162171
{

‎app/code/Magento/Catalog/Model/Plugin/SetPageLayoutDefaultValue.php

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?php
2+
/**
3+
* Plugin for \Magento\Catalog\Model\Category\DataProvider
4+
*
5+
* Copyright © Magento, Inc. All rights reserved.
6+
* See COPYING.txt for license details.
7+
*/
8+
9+
declare(strict_types=1);
10+
11+
namespace Magento\Catalog\Model\Plugin;
12+
13+
use Magento\Catalog\Model\Category\DataProvider;
14+
use Magento\Framework\Exception\NoSuchEntityException;
15+
16+
/**
17+
* Sets the default value for Category Design Layout if provided
18+
*/
19+
class SetPageLayoutDefaultValue
20+
{
21+
private $defaultValue;
22+
23+
/**
24+
* @param string $defaultValue
25+
*/
26+
public function __construct(string $defaultValue = "")
27+
{
28+
$this->defaultValue = $defaultValue;
29+
}
30+
31+
/**
32+
* Sets the default value for Category Design Layout in data provider if provided
33+
*
34+
* @param DataProvider $subject
35+
* @param array $result
36+
* @return array
37+
*
38+
* @throws NoSuchEntityException
39+
*/
40+
public function afterGetDefaultMetaData(DataProvider $subject, array $result): array
41+
{
42+
$currentCategory = $subject->getCurrentCategory();
43+
44+
if ($currentCategory && !$currentCategory->getId() && array_key_exists('page_layout', $result)) {
45+
$result['page_layout']['default'] = $this->defaultValue ?: null;
46+
}
47+
48+
return $result;
49+
}
50+
}

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,5 +400,6 @@
400400
<click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
401401
<waitForElementVisible selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="waitForModalPopUp"/>
402402
<click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
403+
<waitForPageLoad stepKey="waitForGridLoad"/>
403404
</actionGroup>
404405
</actionGroups>

‎app/code/Magento/Catalog/etc/di.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@
7676
<type name="Magento\Customer\Model\ResourceModel\Visitor">
7777
<plugin name="catalogLog" type="Magento\Catalog\Model\Plugin\Log" />
7878
</type>
79+
<type name="Magento\Catalog\Model\Category\DataProvider">
80+
<plugin name="set_page_layout_default_value" type="Magento\Catalog\Model\Plugin\SetPageLayoutDefaultValue" />
81+
</type>
7982
<type name="Magento\Theme\Block\Html\Topmenu">
8083
<plugin name="catalogTopmenu" type="Magento\Catalog\Plugin\Block\Topmenu" />
8184
</type>

‎app/code/Magento/CatalogSearch/Model/Advanced.php

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ public function __construct(
181181
/**
182182
* Add advanced search filters to product collection
183183
*
184-
* @param array $values
185-
* @return $this
184+
* @param array $values
185+
* @return $this
186186
* @throws LocalizedException
187187
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
188188
* @SuppressWarnings(PHPMD.NPathComplexity)
@@ -197,6 +197,11 @@ public function addFilters($values)
197197
if (!isset($values[$attribute->getAttributeCode()])) {
198198
continue;
199199
}
200+
if ($attribute->getFrontendInput() == 'text' || $attribute->getFrontendInput() == 'textarea') {
201+
if (!trim($values[$attribute->getAttributeCode()])) {
202+
continue;
203+
}
204+
}
200205
$value = $values[$attribute->getAttributeCode()];
201206
$preparedSearchValue = $this->getPreparedSearchCriteria($attribute, $value);
202207
if (false === $preparedSearchValue) {
@@ -343,9 +348,9 @@ protected function addSearchCriteria($attribute, $value)
343348
*
344349
* @todo: Move this code to block
345350
*
346-
* @param EntityAttribute $attribute
347-
* @param mixed $value
348-
* @return string|bool
351+
* @param EntityAttribute $attribute
352+
* @param mixed $value
353+
* @return string|bool
349354
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
350355
* @SuppressWarnings(PHPMD.NPathComplexity)
351356
*/

‎app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ public function addStoreFilter($store, $withAdmin = true)
7474
{
7575
if (!$this->getFlag('store_filter_added')) {
7676
$this->performAddStoreFilter($store, $withAdmin);
77+
$this->setFlag('store_filter_added', true);
7778
}
79+
7880
return $this;
7981
}
8082

‎app/code/Magento/Cms/ViewModel/Page/Grid/UrlBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private function prepareRequestQuery(string $store, string $href) : array
103103
StoreManagerInterface::PARAM_NAME => $store,
104104
ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlEncoder->encode($href)
105105
];
106-
if ($storeView->getCode() !== $store) {
106+
if (null !== $storeView && $storeView->getCode() !== $store) {
107107
$query['___from_store'] = $storeView->getCode();
108108
}
109109

‎app/code/Magento/Customer/Test/Mftf/Test/StorefrontClearAllCompareProductsTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
<deleteData createDataKey="createSimpleCategory1" stepKey="deleteSimpleCategory1"/>
117117
<deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
118118
<deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
119+
<deleteData createDataKey="createConfigChildProduct" stepKey="deleteConfigChildProduct"/>
119120
<deleteData createDataKey="createConfigProduct1" stepKey="deleteConfigProduct1"/>
120121
<deleteData createDataKey="createVirtualProduct1" stepKey="deleteVirtualProduct1"/>
121122
<deleteData createDataKey="createBundleProduct1" stepKey="deleteBundleProduct1"/>

0 commit comments

Comments
 (0)