Skip to content

Commit 8865957

Browse files
author
Stanislav Idolov
committed
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-70819
2 parents 2fc146e + 28d4287 commit 8865957

File tree

26 files changed

+1240
-73
lines changed

26 files changed

+1240
-73
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
687687
$options
688688
);
689689

690-
$optionsCollection->appendSelections($selections, false, $_appendAllSelections);
690+
$optionsCollection->appendSelections($selections, true, $_appendAllSelections);
691691

692692
$selections = $selections->getItems();
693693
} else {
@@ -704,7 +704,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
704704
->getOptionsIds($product);
705705
$selectionCollection = $product->getTypeInstance()
706706
->getSelectionsCollection($optionIds, $product);
707-
$options = $optionCollection->appendSelections($selectionCollection, false, $_appendAllSelections);
707+
$options = $optionCollection->appendSelections($selectionCollection, true, $_appendAllSelections);
708708

709709
$selections = $this->mergeSelectionsWithOptions($options, $selections);
710710
}

‎app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ public function testPrepareForCartAdvancedWithoutOptions()
249249
->willReturn($productType);
250250
$optionCollection->expects($this->any())
251251
->method('appendSelections')
252+
->with($selectionCollection, true, true)
252253
->willReturn([$option]);
253254
$productType->expects($this->once())
254255
->method('setStoreFilter');
@@ -433,7 +434,8 @@ function ($key) use ($optionCollection, $selectionCollection) {
433434
->method('getItemById')
434435
->willReturn($option);
435436
$optionCollection->expects($this->once())
436-
->method('appendSelections');
437+
->method('appendSelections')
438+
->with($selectionCollection, true, true);
437439
$productType->expects($this->once())
438440
->method('setStoreFilter');
439441
$buyRequest->expects($this->once())
@@ -668,7 +670,8 @@ function ($key) use ($optionCollection, $selectionCollection) {
668670
->method('getItemById')
669671
->willReturn($option);
670672
$optionCollection->expects($this->once())
671-
->method('appendSelections');
673+
->method('appendSelections')
674+
->with($selectionCollection, true, true);
672675
$productType->expects($this->once())
673676
->method('setStoreFilter');
674677
$buyRequest->expects($this->once())
@@ -891,7 +894,8 @@ function ($key) use ($optionCollection, $selectionCollection) {
891894
->method('getItemById')
892895
->willReturn($option);
893896
$optionCollection->expects($this->once())
894-
->method('appendSelections');
897+
->method('appendSelections')
898+
->with($selectionCollection, true, true);
895899
$productType->expects($this->once())
896900
->method('setStoreFilter');
897901
$buyRequest->expects($this->once())
@@ -1169,7 +1173,8 @@ function ($key) use ($optionCollection, $selectionCollection) {
11691173
}
11701174
);
11711175
$optionCollection->expects($this->once())
1172-
->method('appendSelections');
1176+
->method('appendSelections')
1177+
->with($selectionCollection, true, true);
11731178
$productType->expects($this->once())
11741179
->method('setStoreFilter');
11751180
$buyRequest->expects($this->once())

‎app/code/Magento/Catalog/Pricing/Price/TierPrice.php

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Magento\Framework\Pricing\Price\AbstractPrice;
1717
use Magento\Framework\Pricing\Price\BasePriceProviderInterface;
1818
use Magento\Framework\Pricing\PriceInfoInterface;
19+
use Magento\Customer\Model\Group\RetrieverInterface as CustomerGroupRetrieverInterface;
1920

2021
/**
2122
* @api
@@ -30,6 +31,7 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr
3031

3132
/**
3233
* @var Session
34+
* @deprecated
3335
*/
3436
protected $customerSession;
3537

@@ -57,30 +59,39 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr
5759
*/
5860
protected $groupManagement;
5961

62+
/**
63+
* @var CustomerGroupRetrieverInterface
64+
*/
65+
private $customerGroupRetriever;
66+
6067
/**
6168
* @param Product $saleableItem
6269
* @param float $quantity
6370
* @param CalculatorInterface $calculator
6471
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
6572
* @param Session $customerSession
6673
* @param GroupManagementInterface $groupManagement
74+
* @param CustomerGroupRetrieverInterface|null $customerGroupRetriever
6775
*/
6876
public function __construct(
6977
Product $saleableItem,
7078
$quantity,
7179
CalculatorInterface $calculator,
7280
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
7381
Session $customerSession,
74-
GroupManagementInterface $groupManagement
82+
GroupManagementInterface $groupManagement,
83+
CustomerGroupRetrieverInterface $customerGroupRetriever = null
7584
) {
7685
$quantity = $quantity ?: 1;
7786
parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
7887
$this->customerSession = $customerSession;
7988
$this->groupManagement = $groupManagement;
89+
$this->customerGroupRetriever = $customerGroupRetriever
90+
?? \Magento\Framework\App\ObjectManager::getInstance()->get(CustomerGroupRetrieverInterface::class);
8091
if ($saleableItem->hasCustomerGroupId()) {
8192
$this->customerGroup = (int) $saleableItem->getCustomerGroupId();
8293
} else {
83-
$this->customerGroup = (int) $this->customerSession->getCustomerGroupId();
94+
$this->customerGroup = (int) $this->customerGroupRetriever->getCustomerGroupId();
8495
}
8596
}
8697

‎app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,47 +25,52 @@ class TierPriceTest extends \PHPUnit\Framework\TestCase
2525
*
2626
* @var int
2727
*/
28-
protected $customerGroup = Group::NOT_LOGGED_IN_ID;
28+
private $customerGroup = Group::NOT_LOGGED_IN_ID;
2929

3030
/**
3131
* @var \PHPUnit_Framework_MockObject_MockObject
3232
*/
33-
protected $priceInfo;
33+
private $priceInfo;
3434

3535
/**
3636
* @var \PHPUnit_Framework_MockObject_MockObject
3737
*/
38-
protected $product;
38+
private $product;
3939

4040
/**
4141
* @var float
4242
*/
43-
protected $quantity = 3.;
43+
private $quantity = 3.;
4444

4545
/**
4646
* @var \PHPUnit_Framework_MockObject_MockObject
4747
*/
48-
protected $calculator;
48+
private $calculator;
4949

5050
/**
5151
* @var \PHPUnit_Framework_MockObject_MockObject
5252
*/
53-
protected $session;
53+
private $session;
5454

5555
/**
5656
* @var TierPrice
5757
*/
58-
protected $model;
58+
private $model;
5959

6060
/**
6161
* @var \Magento\Framework\Pricing\PriceCurrencyInterface|\PHPUnit_Framework_MockObject_MockObject
6262
*/
63-
protected $priceCurrencyMock;
63+
private $priceCurrencyMock;
6464

6565
/**
6666
* @var \PHPUnit_Framework_MockObject_MockObject
6767
*/
68-
protected $groupManagement;
68+
private $groupManagement;
69+
70+
/**
71+
* @var \Magento\Customer\Model\Group\RetrieverInterface|\PHPUnit_Framework_MockObject_MockObject
72+
*/
73+
private $customerGroupRetriever;
6974

7075
/**
7176
* Initialize base dependencies
@@ -76,11 +81,12 @@ protected function setUp()
7681

7782
$this->product = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['getPriceInfo', 'hasCustomerGroupId', 'getCustomerGroupId', 'getResource', '__wakeup']);
7883
$this->product->expects($this->any())->method('getPriceInfo')->will($this->returnValue($this->priceInfo));
79-
84+
$this->customerGroupRetriever = $this->getMockBuilder(\Magento\Customer\Model\Group\RetrieverInterface::class)
85+
->disableOriginalConstructor()->getMock();
8086
$this->session = $this->createMock(\Magento\Customer\Model\Session::class);
8187
$this->session->expects($this->any())->method('getCustomerGroupId')
8288
->will($this->returnValue($this->customerGroup));
83-
89+
$this->customerGroupRetriever = $this->createMock(\Magento\Customer\Model\Group\RetrieverInterface::class);
8490
$this->calculator = $this->createMock(\Magento\Framework\Pricing\Adjustment\Calculator::class);
8591
$this->groupManagement = $this->createMock(\Magento\Customer\Api\GroupManagementInterface::class);
8692

@@ -92,7 +98,8 @@ protected function setUp()
9298
$this->calculator,
9399
$this->priceCurrencyMock,
94100
$this->session,
95-
$this->groupManagement
101+
$this->groupManagement,
102+
$this->customerGroupRetriever
96103
);
97104
}
98105

@@ -218,7 +225,8 @@ public function testGetterStoredTierPrices()
218225
$this->calculator,
219226
$this->priceCurrencyMock,
220227
$this->session,
221-
$this->groupManagement
228+
$this->groupManagement,
229+
$this->customerGroupRetriever
222230
);
223231
$group = $this->createMock(\Magento\Customer\Model\Data\Group::class);
224232
$group->expects($this->once())->method('getId')->willReturn(GroupManagement::CUST_GROUP_ALL);

‎app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ public function beforeSave(
5656
) {
5757
$this->saveIsNew = $attribute->isObjectNew();
5858
$this->saveNeedInvalidation = (
59-
$attribute->dataHasChangedFor('is_searchable')
60-
|| $attribute->dataHasChangedFor('is_filterable')
61-
|| $attribute->dataHasChangedFor('is_visible_in_advanced_search')
62-
) && ! $this->saveIsNew;
59+
$attribute->dataHasChangedFor('is_searchable')
60+
|| $attribute->dataHasChangedFor('is_filterable')
61+
|| $attribute->dataHasChangedFor('is_visible_in_advanced_search')
62+
);
6363
}
6464

6565
/**

‎app/code/Magento/Customer/Model/Group/Retriever.php

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Customer\Model\Group;
7+
8+
use Magento\Customer\Model\Session;
9+
10+
/**
11+
* Class for getting current customer group from customer session.
12+
*/
13+
class Retriever implements RetrieverInterface
14+
{
15+
/**
16+
* @var Session
17+
*/
18+
private $customerSession;
19+
20+
/**
21+
* @param Session $customerSession
22+
*/
23+
public function __construct(Session $customerSession)
24+
{
25+
$this->customerSession = $customerSession;
26+
}
27+
28+
/**
29+
* @inheritdoc
30+
*/
31+
public function getCustomerGroupId()
32+
{
33+
return $this->customerSession->getCustomerGroupId();
34+
}
35+
}

‎app/code/Magento/Customer/Model/Group/RetrieverInterface.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Customer\Model\Group;
7+
8+
/**
9+
* Interface for getting current customer group from session.
10+
*
11+
* @api
12+
*/
13+
interface RetrieverInterface
14+
{
15+
/**
16+
* Retrieve customer group id.
17+
*
18+
* @return int
19+
*/
20+
public function getCustomerGroupId();
21+
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959
type="Magento\Customer\Model\Customer\Attribute\Source\Group"/>
6060
<preference for="Magento\Customer\Block\Account\SortLinkInterface"
6161
type="Magento\Customer\Block\Account\SortLink"/>
62+
<preference for="Magento\Customer\Model\Group\RetrieverInterface"
63+
type="Magento\Customer\Model\Group\Retriever"/>
6264
<type name="Magento\Customer\Model\Session">
6365
<arguments>
6466
<argument name="configShare" xsi:type="object">Magento\Customer\Model\Config\Share\Proxy</argument>

‎app/code/Magento/Eav/Model/Entity/AbstractEntity.php

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ public function getEntityIdField()
767767
*/
768768
public function getValueEntityIdField()
769769
{
770-
return $this->getEntityIdField();
770+
return $this->getLinkField();
771771
}
772772

773773
/**
@@ -885,28 +885,33 @@ public function checkAttributeUniqueValue(AbstractAttribute $attribute, $object)
885885
{
886886
$connection = $this->getConnection();
887887
$select = $connection->select();
888-
if ($attribute->getBackend()->getType() === 'static') {
888+
889+
$entityIdField = $this->getEntityIdField();
890+
$attributeBackend = $attribute->getBackend();
891+
if ($attributeBackend->getType() === 'static') {
889892
$value = $object->getData($attribute->getAttributeCode());
890893
$bind = ['value' => trim($value)];
891894

892895
$select->from(
893896
$this->getEntityTable(),
894-
$this->getEntityIdField()
897+
$entityIdField
895898
)->where(
896899
$attribute->getAttributeCode() . ' = :value'
897900
);
898901
} else {
899902
$value = $object->getData($attribute->getAttributeCode());
900-
if ($attribute->getBackend()->getType() == 'datetime') {
903+
if ($attributeBackend->getType() == 'datetime') {
901904
$value = (new \DateTime($value))->format('Y-m-d H:i:s');
902905
}
903906
$bind = [
904907
'attribute_id' => $attribute->getId(),
905908
'value' => trim($value),
906909
];
910+
911+
$entityIdField = $attributeBackend->getEntityIdField();
907912
$select->from(
908-
$attribute->getBackend()->getTable(),
909-
$object->getResource()->getLinkField()
913+
$attributeBackend->getTable(),
914+
$entityIdField
910915
)->where(
911916
'attribute_id = :attribute_id'
912917
)->where(
@@ -921,9 +926,10 @@ public function checkAttributeUniqueValue(AbstractAttribute $attribute, $object)
921926

922927
$data = $connection->fetchCol($select, $bind);
923928

924-
if ($object->getId()) {
929+
$objectId = $object->getData($entityIdField);
930+
if ($objectId) {
925931
if (isset($data[0])) {
926-
return $data[0] == $object->getId();
932+
return $data[0] == $objectId;
927933
}
928934
return true;
929935
}

0 commit comments

Comments
 (0)