Skip to content

Commit 93e2f21

Browse files
author
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/develop' into PR-webdev
2 parents 8bbc70b + 6352f8f commit 93e2f21

File tree

276 files changed

+3014
-4264
lines changed

Some content is hidden

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

276 files changed

+3014
-4264
lines changed

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -985,14 +985,14 @@ private function invokeMethod($object, $method, $args = [])
985985
private function getAdvancedPricingMock($methods = [])
986986
{
987987
$metadataPoolMock = $this->getMock(
988-
\Magento\Framework\Model\Entity\MetadataPool::class,
988+
\Magento\Framework\EntityManager\MetadataPool::class,
989989
[],
990990
[],
991991
'',
992992
false
993993
);
994994
$metadataMock = $this->getMock(
995-
\Magento\Framework\Model\Entity\EntityMetadata::class,
995+
\Magento\Framework\EntityManager\EntityMetadata::class,
996996
[],
997997
[],
998998
'',

app/code/Magento/Bundle/Model/LinkManagement.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use Magento\Framework\App\ObjectManager;
1212
use Magento\Framework\Exception\CouldNotSaveException;
1313
use Magento\Framework\Exception\InputException;
14-
use Magento\Framework\Model\Entity\MetadataPool;
14+
use Magento\Framework\EntityManager\MetadataPool;
1515

1616
/**
1717
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)

app/code/Magento/Bundle/Model/OptionRepository.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use Magento\Framework\Exception\CouldNotSaveException;
1212
use Magento\Framework\Exception\InputException;
1313
use Magento\Framework\Exception\NoSuchEntityException;
14-
use Magento\Framework\Model\Entity\MetadataPool;
14+
use Magento\Framework\EntityManager\MetadataPool;
1515

1616
/**
1717
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -64,7 +64,7 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
6464
protected $dataObjectHelper;
6565

6666
/**
67-
* @var \Magento\Framework\Model\Entity\MetadataPool
67+
* @var \Magento\Framework\EntityManager\MetadataPool
6868
*/
6969
private $metadataPool;
7070

app/code/Magento/Bundle/Model/Product/ReadHandler.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
namespace Magento\Bundle\Model\Product;
77

88
use Magento\Bundle\Api\ProductOptionRepositoryInterface as OptionRepository;
9+
use Magento\Framework\EntityManager\Operation\ExtensionInterface;
910

1011
/**
1112
* Class ReadHandler
1213
*/
13-
class ReadHandler
14+
class ReadHandler implements ExtensionInterface
1415
{
1516
/**
1617
* @var OptionRepository
@@ -30,10 +31,11 @@ public function __construct(OptionRepository $optionRepository)
3031
/**
3132
* @param string $entityType
3233
* @param object $entity
34+
* @param array $arguments
3335
* @return \Magento\Catalog\Api\Data\ProductInterface
3436
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
3537
*/
36-
public function execute($entityType, $entity)
38+
public function execute($entityType, $entity, $arguments = [])
3739
{
3840
/** @var $entity \Magento\Catalog\Api\Data\ProductInterface */
3941
if ($entity->getTypeId() != \Magento\Bundle\Model\Product\Type::TYPE_CODE) {

app/code/Magento/Bundle/Model/Product/SaveHandler.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
namespace Magento\Bundle\Model\Product;
88

99
use Magento\Bundle\Api\ProductOptionRepositoryInterface as OptionRepository;
10-
use Magento\Framework\Model\Entity\MetadataPool;
11-
use Magento\Framework\Model\ResourceModel\Db\ProcessEntityRelationInterface;
10+
use Magento\Framework\EntityManager\MetadataPool;
1211
use Magento\Bundle\Api\ProductLinkManagementInterface;
12+
use Magento\Framework\EntityManager\Operation\ExtensionInterface;
1313

1414
/**
1515
* Class SaveHandler
1616
*/
17-
class SaveHandler
17+
class SaveHandler implements ExtensionInterface
1818
{
1919
/**
2020
* @var MetadataPool
@@ -49,10 +49,11 @@ public function __construct(
4949
/**
5050
* @param string $entityType
5151
* @param object $entity
52-
* @return object
52+
* @param array $arguments
53+
* @return \Magento\Catalog\Api\Data\ProductInterface|object
5354
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
5455
*/
55-
public function execute($entityType, $entity)
56+
public function execute($entityType, $entity, $arguments = [])
5657
{
5758
$bundleProductOptions = $entity->getExtensionAttributes()->getBundleProductOptions();
5859
if ($entity->getTypeId() !== 'bundle' || empty($bundleProductOptions)) {

app/code/Magento/Bundle/Model/ResourceModel/Option.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Magento\Bundle\Model\ResourceModel;
77

88
use Magento\Catalog\Api\Data\ProductInterface;
9-
use Magento\Framework\Model\Entity\MetadataPool;
9+
use Magento\Framework\EntityManager\MetadataPool;
1010
use Magento\Framework\App\ObjectManager;
1111

1212
/**

app/code/Magento/Bundle/Model/ResourceModel/Selection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Magento\Bundle\Model\ResourceModel;
77

88
use Magento\Catalog\Api\Data\ProductInterface;
9-
use Magento\Framework\Model\Entity\MetadataPool;
9+
use Magento\Framework\EntityManager\MetadataPool;
1010
use Magento\Framework\Model\ResourceModel\Db\Context;
1111

1212
/**

app/code/Magento/Bundle/Setup/Recurring.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Magento\Framework\Setup\InstallSchemaInterface;
1010
use Magento\Framework\Setup\ModuleContextInterface;
1111
use Magento\Framework\Setup\SchemaSetupInterface;
12-
use Magento\Framework\Model\Entity\MetadataPool;
12+
use Magento\Framework\EntityManager\MetadataPool;
1313
use Magento\Catalog\Api\Data\ProductInterface;
1414

1515
/**

app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@ class LinkManagementTest extends \PHPUnit_Framework_TestCase
101101
protected $dataObjectHelperMock;
102102

103103
/**
104-
* @var \Magento\Framework\Model\Entity\MetadataPool|\PHPUnit_Framework_MockObject_MockObject
104+
* @var \Magento\Framework\EntityManager\MetadataPool|\PHPUnit_Framework_MockObject_MockObject
105105
*/
106106
protected $metadataPoolMock;
107107

108108
/**
109-
* @var \Magento\Framework\Model\Entity\EntityMetadata|\PHPUnit_Framework_MockObject_MockObject
109+
* @var \Magento\Framework\EntityManager\EntityMetadata|\PHPUnit_Framework_MockObject_MockObject
110110
*/
111111
protected $metadataMock;
112112

@@ -159,10 +159,10 @@ protected function setUp()
159159
'\Magento\Bundle\Model\ResourceModel\Option\CollectionFactory', ['create'], [], '', false
160160
);
161161
$this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
162-
$this->metadataPoolMock = $this->getMockBuilder('\Magento\Framework\Model\Entity\MetadataPool')
162+
$this->metadataPoolMock = $this->getMockBuilder('\Magento\Framework\EntityManager\MetadataPool')
163163
->disableOriginalConstructor()
164164
->getMock();
165-
$this->metadataMock = $this->getMockBuilder('\Magento\Framework\Model\Entity\EntityMetadata')
165+
$this->metadataMock = $this->getMockBuilder('\Magento\Framework\EntityManager\EntityMetadata')
166166
->disableOriginalConstructor()
167167
->getMock();
168168
$this->metadataPoolMock->expects($this->any())->method('getMetadata')

app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ protected function setUp()
9797
$this->linkManagementMock = $this->getMock('\Magento\Bundle\Api\ProductLinkManagementInterface');
9898
$this->optionListMock = $this->getMock('\Magento\Bundle\Model\Product\OptionList', [], [], '', false);
9999
$this->linkListMock = $this->getMock('\Magento\Bundle\Model\Product\LinksList', [], [], '', false);
100-
$this->metadataPoolMock = $this->getMock('Magento\Framework\Model\Entity\MetadataPool', [], [], '', false);
100+
$this->metadataPoolMock = $this->getMock('Magento\Framework\EntityManager\MetadataPool', [], [], '', false);
101101

102102
$this->model = new OptionRepository(
103103
$this->productRepositoryMock,
@@ -295,7 +295,7 @@ public function testSaveExistingOption()
295295
false
296296
);
297297
$metadataMock = $this->getMock(
298-
'Magento\Framework\Model\Entity\EntityMetadata',
298+
'Magento\Framework\EntityManager\EntityMetadata',
299299
[],
300300
[],
301301
'',
@@ -352,7 +352,7 @@ public function testSaveNewOption()
352352
false
353353
);
354354
$metadataMock = $this->getMock(
355-
'Magento\Framework\Model\Entity\EntityMetadata',
355+
'Magento\Framework\EntityManager\EntityMetadata',
356356
[],
357357
[],
358358
'',
@@ -416,7 +416,7 @@ public function testSaveCanNotSave()
416416
false
417417
);
418418
$metadataMock = $this->getMock(
419-
'Magento\Framework\Model\Entity\EntityMetadata',
419+
'Magento\Framework\EntityManager\EntityMetadata',
420420
[],
421421
[],
422422
'',

0 commit comments

Comments
 (0)