Skip to content

Commit 4294b2b

Browse files
committed
resolved conflicts in tests
2 parents 4d5a567 + bd4a5bb commit 4294b2b

File tree

1 file changed

+15
-45
lines changed

1 file changed

+15
-45
lines changed

app/code/Meta/BusinessExtension/Test/Unit/Helper/FBEHelperTest.php

Lines changed: 15 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -35,43 +35,13 @@ class FBEHelperTest extends TestCase
3535
/**
3636
* @var FBEHelper
3737
*/
38-
private $fbeHelper;
39-
40-
/**
41-
* @var MockObject
42-
*/
43-
private $systemConfig;
44-
45-
/**
46-
* @var MockObject
47-
*/
48-
private $context;
38+
private FBEHelper $fbeHelper;
4939

5040
/**
5141
* @var MockObject
5242
*/
5343
private $objectManagerInterface;
5444

55-
/**
56-
* @var MockObject
57-
*/
58-
private $logger;
59-
60-
/**
61-
* @var MockObject
62-
*/
63-
private $storeManager;
64-
65-
/**
66-
* @var MockObject
67-
*/
68-
private $curl;
69-
70-
/**
71-
* @var MockObject
72-
*/
73-
private $resourceConnection;
74-
7545
/**
7646
* @var MockObject
7747
*/
@@ -93,25 +63,25 @@ public function tearDown(): void
9363
*/
9464
public function setUp(): void
9565
{
96-
$this->context = $this->createMock(Context::class);
66+
$context = $this->createMock(Context::class);
9767
$this->objectManagerInterface = $this->createMock(ObjectManagerInterface::class);
98-
$this->logger = $this->createMock(Logger::class);
99-
$this->storeManager = $this->createMock(StoreManagerInterface::class);
100-
$this->curl = $this->createMock(Curl::class);
101-
$this->resourceConnection = $this->createMock(ResourceConnection::class);
68+
$logger = $this->createMock(Logger::class);
69+
$storeManager = $this->createMock(StoreManagerInterface::class);
70+
$curl = $this->createMock(Curl::class);
71+
$resourceConnection = $this->createMock(ResourceConnection::class);
10272
$this->moduleList = $this->createMock(ModuleListInterface::class);
103-
$this->systemConfig = $this->createMock(Config::class);
104-
$this->productMetadata = $this->createMock(ProductMetadataInterface::class);
73+
$systemConfig = $this->createMock(Config::class);
74+
$productMetaData = $this->createMock(ProductMetadataInterface::class);
10575
$this->fbeHelper = new FBEHelper(
106-
$this->context,
76+
$context,
10777
$this->objectManagerInterface,
108-
$this->logger,
109-
$this->storeManager,
110-
$this->curl,
111-
$this->resourceConnection,
78+
$logger,
79+
$storeManager,
80+
$curl,
81+
$resourceConnection,
11282
$this->moduleList,
113-
$this->systemConfig,
114-
$this->productMetadata
83+
$systemConfig,
84+
$productMetaData
11585
);
11686
}
11787

0 commit comments

Comments
 (0)