Skip to content

Commit 426e322

Browse files
rganinrganin
committed
Merge branch '2.3-develop' of github.com:magento/magento2ce into MAGETWO-90803
2 parents 73689a1 + 4832a75 commit 426e322

File tree

366 files changed

+9367
-4480
lines changed

Some content is hidden

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

366 files changed

+9367
-4480
lines changed

‎.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@ language: php
1818
php:
1919
- 7.1
2020
- 7.2
21+
git:
22+
depth: 5
2123
env:
2224
global:
2325
- COMPOSER_BIN_DIR=~/bin
2426
- INTEGRATION_SETS=3
25-
- NODE_JS_VERSION=6
27+
- NODE_JS_VERSION=8
2628
- MAGENTO_HOST_NAME="magento2.travis"
2729
matrix:
2830
- TEST_SUITE=unit

‎COPYING.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright © 2013-2018 Magento, Inc.
1+
Copyright © 2013-present Magento, Inc.
22

33
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
44

‎app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
use Magento\Framework\Model\ResourceModel\Db\Context;
1111
use Magento\Framework\EntityManager\MetadataPool;
1212
use Magento\Catalog\Api\Data\CategoryInterface;
13+
use Magento\Framework\App\ObjectManager;
14+
use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver as TableResolver;
15+
use Magento\Framework\Search\Request\Dimension;
16+
use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
1317

1418
/**
1519
* @api
@@ -29,22 +33,30 @@ class Index extends AbstractDb
2933
*/
3034
protected $metadataPool;
3135

36+
/**
37+
* @var TableResolver
38+
*/
39+
private $tableResolver;
40+
3241
/**
3342
* Index constructor.
3443
* @param Context $context
3544
* @param StoreManagerInterface $storeManager
3645
* @param MetadataPool $metadataPool
3746
* @param null $connectionName
47+
* @param TableResolver|null $tableResolver
3848
*/
3949
public function __construct(
4050
Context $context,
4151
StoreManagerInterface $storeManager,
4252
MetadataPool $metadataPool,
43-
$connectionName = null
53+
$connectionName = null,
54+
TableResolver $tableResolver = null
4455
) {
4556
parent::__construct($context, $connectionName);
4657
$this->storeManager = $storeManager;
4758
$this->metadataPool = $metadataPool;
59+
$this->tableResolver = $tableResolver ?: ObjectManager::getInstance()->get(TableResolver::class);
4860
}
4961

5062
/**
@@ -116,8 +128,17 @@ public function getCategoryProductIndexData($storeId = null, $productIds = null)
116128
{
117129
$connection = $this->getConnection();
118130

131+
$catalogCategoryProductDimension = new Dimension(\Magento\Store\Model\Store::ENTITY, $storeId);
132+
133+
$catalogCategoryProductTableName = $this->tableResolver->resolve(
134+
AbstractAction::MAIN_INDEX_TABLE,
135+
[
136+
$catalogCategoryProductDimension
137+
]
138+
);
139+
119140
$select = $connection->select()->from(
120-
[$this->getTable('catalog_category_product_index')],
141+
[$catalogCategoryProductTableName],
121142
['category_id', 'product_id', 'position', 'store_id']
122143
)->where(
123144
'store_id = ?',

‎app/code/Magento/Backend/Block/Template.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
declare(strict_types=1);
8+
69
namespace Magento\Backend\Block;
710

811
/**
@@ -17,10 +20,12 @@
1720
* Example:
1821
* <block name="my.block" class="Magento\Backend\Block\Template" template="My_Module::template.phtml" >
1922
* <arguments>
20-
* <argument name="viewModel" xsi:type="object">My\Module\ViewModel\Custom</argument>
23+
* <argument name="view_model" xsi:type="object">My\Module\ViewModel\Custom</argument>
2124
* </arguments>
2225
* </block>
2326
*
27+
* Your class object can then be accessed by doing $block->getViewModel()
28+
*
2429
* @api
2530
* @SuppressWarnings(PHPMD.NumberOfChildren)
2631
* @since 100.0.2

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
137137
</field>
138138
<field id="template_hints_blocks" translate="label" type="select" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="1">
139-
<label>Add Block Names to Hints</label>
139+
<label>Add Block Class Type to Hints</label>
140140
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
141141
</field>
142142
</group>

‎app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,13 @@ public function __construct(
6666
public function beforeSave()
6767
{
6868
$value = $this->getValue();
69+
if (!is_array($value)) {
70+
try {
71+
$value = $this->serializer->unserialize($value);
72+
} catch (\InvalidArgumentException $e) {
73+
$value = [];
74+
}
75+
}
6976
$result = [];
7077
foreach ($value as $data) {
7178
if (empty($data['country_id']) || empty($data['cc_types'])) {

‎app/code/Magento/Bundle/Model/Option/SaveAction.php

Lines changed: 195 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,195 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\Bundle\Model\Option;
9+
10+
use Magento\Bundle\Api\Data\OptionInterface;
11+
use Magento\Bundle\Model\ResourceModel\Option;
12+
use Magento\Catalog\Api\Data\ProductInterface;
13+
use Magento\Framework\EntityManager\MetadataPool;
14+
use Magento\Framework\Exception\CouldNotSaveException;
15+
use Magento\Bundle\Model\Product\Type;
16+
use Magento\Bundle\Api\ProductLinkManagementInterface;
17+
18+
/**
19+
* Encapsulates logic for saving a bundle option, including coalescing the parent product's data.
20+
*/
21+
class SaveAction
22+
{
23+
/**
24+
* @var Option
25+
*/
26+
private $optionResource;
27+
28+
/**
29+
* @var MetadataPool
30+
*/
31+
private $metadataPool;
32+
33+
/**
34+
* @var Type
35+
*/
36+
private $type;
37+
38+
/**
39+
* @var ProductLinkManagementInterface
40+
*/
41+
private $linkManagement;
42+
43+
/**
44+
* @param Option $optionResource
45+
* @param MetadataPool $metadataPool
46+
* @param Type $type
47+
* @param ProductLinkManagementInterface $linkManagement
48+
*/
49+
public function __construct(
50+
Option $optionResource,
51+
MetadataPool $metadataPool,
52+
Type $type,
53+
ProductLinkManagementInterface $linkManagement
54+
) {
55+
$this->optionResource = $optionResource;
56+
$this->metadataPool = $metadataPool;
57+
$this->type = $type;
58+
$this->linkManagement = $linkManagement;
59+
}
60+
61+
/**
62+
* Manage the logic of saving a bundle option, including the coalescence of its parent product data.
63+
*
64+
* @param ProductInterface $bundleProduct
65+
* @param OptionInterface $option
66+
* @return OptionInterface
67+
* @throws CouldNotSaveException
68+
* @throws \Exception
69+
*/
70+
public function save(ProductInterface $bundleProduct, OptionInterface $option)
71+
{
72+
$metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
73+
74+
$option->setStoreId($bundleProduct->getStoreId());
75+
$parentId = $bundleProduct->getData($metadata->getLinkField());
76+
$option->setParentId($parentId);
77+
78+
$optionId = $option->getOptionId();
79+
$linksToAdd = [];
80+
$optionCollection = $this->type->getOptionsCollection($bundleProduct);
81+
$optionCollection->setIdFilter($option->getOptionId());
82+
$optionCollection->setProductLinkFilter($parentId);
83+
84+
/** @var \Magento\Bundle\Model\Option $existingOption */
85+
$existingOption = $optionCollection->getFirstItem();
86+
if (!$optionId || $existingOption->getParentId() != $parentId) {
87+
//If option ID is empty or existing option's parent ID is different
88+
//we'd need a new ID for the option.
89+
$option->setOptionId(null);
90+
$option->setDefaultTitle($option->getTitle());
91+
if (is_array($option->getProductLinks())) {
92+
$linksToAdd = $option->getProductLinks();
93+
}
94+
} else {
95+
if (!$existingOption->getOptionId()) {
96+
throw new NoSuchEntityException(
97+
__("The option that was requested doesn't exist. Verify the entity and try again.")
98+
);
99+
}
100+
101+
$option->setData(array_merge($existingOption->getData(), $option->getData()));
102+
$this->updateOptionSelection($bundleProduct, $option);
103+
}
104+
105+
try {
106+
$this->optionResource->save($option);
107+
} catch (\Exception $e) {
108+
throw new CouldNotSaveException(__("The option couldn't be saved."), $e);
109+
}
110+
111+
/** @var \Magento\Bundle\Api\Data\LinkInterface $linkedProduct */
112+
foreach ($linksToAdd as $linkedProduct) {
113+
$this->linkManagement->addChild($bundleProduct, $option->getOptionId(), $linkedProduct);
114+
}
115+
116+
$bundleProduct->setIsRelationsChanged(true);
117+
118+
return $option;
119+
}
120+
121+
/**
122+
* Update option selections
123+
*
124+
* @param \Magento\Catalog\Api\Data\ProductInterface $product
125+
* @param \Magento\Bundle\Api\Data\OptionInterface $option
126+
* @return void
127+
*/
128+
private function updateOptionSelection(ProductInterface $product, OptionInterface $option)
129+
{
130+
$optionId = $option->getOptionId();
131+
$existingLinks = $this->linkManagement->getChildren($product->getSku(), $optionId);
132+
$linksToAdd = [];
133+
$linksToUpdate = [];
134+
$linksToDelete = [];
135+
if (is_array($option->getProductLinks())) {
136+
$productLinks = $option->getProductLinks();
137+
foreach ($productLinks as $productLink) {
138+
if (!$productLink->getId() && !$productLink->getSelectionId()) {
139+
$linksToAdd[] = $productLink;
140+
} else {
141+
$linksToUpdate[] = $productLink;
142+
}
143+
}
144+
/** @var \Magento\Bundle\Api\Data\LinkInterface[] $linksToDelete */
145+
$linksToDelete = $this->compareLinks($existingLinks, $linksToUpdate);
146+
}
147+
foreach ($linksToUpdate as $linkedProduct) {
148+
$this->linkManagement->saveChild($product->getSku(), $linkedProduct);
149+
}
150+
foreach ($linksToDelete as $linkedProduct) {
151+
$this->linkManagement->removeChild(
152+
$product->getSku(),
153+
$option->getOptionId(),
154+
$linkedProduct->getSku()
155+
);
156+
}
157+
foreach ($linksToAdd as $linkedProduct) {
158+
$this->linkManagement->addChild($product, $option->getOptionId(), $linkedProduct);
159+
}
160+
}
161+
162+
/**
163+
* Compute the difference between given arrays.
164+
*
165+
* @param \Magento\Bundle\Api\Data\LinkInterface[] $firstArray
166+
* @param \Magento\Bundle\Api\Data\LinkInterface[] $secondArray
167+
*
168+
* @return array
169+
*/
170+
private function compareLinks(array $firstArray, array $secondArray)
171+
{
172+
$result = [];
173+
174+
$firstArrayIds = [];
175+
$firstArrayMap = [];
176+
177+
$secondArrayIds = [];
178+
179+
foreach ($firstArray as $item) {
180+
$firstArrayIds[] = $item->getId();
181+
182+
$firstArrayMap[$item->getId()] = $item;
183+
}
184+
185+
foreach ($secondArray as $item) {
186+
$secondArrayIds[] = $item->getId();
187+
}
188+
189+
foreach (array_diff($firstArrayIds, $secondArrayIds) as $id) {
190+
$result[] = $firstArrayMap[$id];
191+
}
192+
193+
return $result;
194+
}
195+
}

0 commit comments

Comments
 (0)