Skip to content

Commit bf10481

Browse files
manjusha729manjusha729
committed
ACQE-5710 : Deprecation error Fix Unit-Test
1 parent 15e91f9 commit bf10481

21 files changed

+79
-79
lines changed

‎dev/tests/unit/Magento/FunctionalTestFramework/Console/BaseGenerateCommandTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ protected function tearDown(): void
3131
$testsProperty->setValue($handler, []);
3232
$testObjectHandlerProperty = new ReflectionProperty(TestObjectHandler::class, 'testObjectHandler');
3333
$testObjectHandlerProperty->setAccessible(true);
34-
$testObjectHandlerProperty->setValue($handler);
34+
$testObjectHandlerProperty->setValue(null, $handler);
3535

3636
$handler = SuiteObjectHandler::getInstance();
3737
$suiteObjectsProperty = new ReflectionProperty(SuiteObjectHandler::class, 'suiteObjects');
3838
$suiteObjectsProperty->setAccessible(true);
3939
$suiteObjectsProperty->setValue($handler, []);
4040
$suiteObjectHandlerProperty = new ReflectionProperty(SuiteObjectHandler::class, 'instance');
4141
$suiteObjectHandlerProperty->setAccessible(true);
42-
$suiteObjectHandlerProperty->setValue($handler);
42+
$suiteObjectHandlerProperty->setValue(null, $handler);
4343
}
4444

4545
public function testOneTestOneSuiteConfig(): void
@@ -218,7 +218,7 @@ public function mockHandlers(array $testArray, array $suiteArray): void
218218

219219
$testObjectHandlerProperty = new ReflectionProperty(TestObjectHandler::class, 'testObjectHandler');
220220
$testObjectHandlerProperty->setAccessible(true);
221-
$testObjectHandlerProperty->setValue($testObjectHandlerObject);
221+
$testObjectHandlerProperty->setValue(null, $testObjectHandlerObject);
222222

223223
$handler = TestObjectHandler::getInstance();
224224
$property = new ReflectionProperty(TestObjectHandler::class, 'tests');
@@ -234,7 +234,7 @@ public function mockHandlers(array $testArray, array $suiteArray): void
234234

235235
$suiteObjectHandlerProperty = new ReflectionProperty(SuiteObjectHandler::class, 'instance');
236236
$suiteObjectHandlerProperty->setAccessible(true);
237-
$suiteObjectHandlerProperty->setValue($suiteObjectHandlerObject);
237+
$suiteObjectHandlerProperty->setValue(null, $suiteObjectHandlerObject);
238238

239239
$handler = SuiteObjectHandler::getInstance();
240240
$property = new ReflectionProperty(SuiteObjectHandler::class, 'suiteObjects');

‎dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Handlers/DataObjectHandlerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ private function mockDataObjectHandlerWithData(array $mockData): void
324324
{
325325
$dataObjectHandlerProperty = new ReflectionProperty(DataObjectHandler::class, "INSTANCE");
326326
$dataObjectHandlerProperty->setAccessible(true);
327-
$dataObjectHandlerProperty->setValue(null);
327+
$dataObjectHandlerProperty->setValue(null, null);
328328

329329
$mockDataProfileSchemaParser = $this->createMock(DataProfileSchemaParser::class);
330330
$mockDataProfileSchemaParser
@@ -355,7 +355,7 @@ function (
355355

356356
$property = new ReflectionProperty(ObjectManager::class, 'instance');
357357
$property->setAccessible(true);
358-
$property->setValue($mockObjectManagerInstance);
358+
$property->setValue(null, $mockObjectManagerInstance);
359359
}
360360

361361
/**
@@ -367,11 +367,11 @@ public static function tearDownAfterClass(): void
367367

368368
$dataObjectHandlerProperty = new ReflectionProperty(DataObjectHandler::class, "INSTANCE");
369369
$dataObjectHandlerProperty->setAccessible(true);
370-
$dataObjectHandlerProperty->setValue(null);
370+
$dataObjectHandlerProperty->setValue(null, null);
371371

372372
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
373373
$objectManagerProperty->setAccessible(true);
374-
$objectManagerProperty->setValue(null);
374+
$objectManagerProperty->setValue(null, null);
375375

376376
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
377377
}

‎dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Handlers/OperationDefinitionObjectHandlerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ private function mockOperationHandlerWithData(array $mockData): void
506506
'INSTANCE'
507507
);
508508
$operationDefinitionObjectHandlerProperty->setAccessible(true);
509-
$operationDefinitionObjectHandlerProperty->setValue(null);
509+
$operationDefinitionObjectHandlerProperty->setValue(null, null);
510510

511511
$mockOperationParser = $this->createMock(OperationDefinitionParser::class);
512512
$mockOperationParser
@@ -537,7 +537,7 @@ function (
537537

538538
$property = new ReflectionProperty(ObjectManager::class, 'instance');
539539
$property->setAccessible(true);
540-
$property->setValue($mockObjectManagerInstance);
540+
$property->setValue(null, $mockObjectManagerInstance);
541541
}
542542

543543
/**
@@ -552,11 +552,11 @@ public static function tearDownAfterClass(): void
552552
'INSTANCE'
553553
);
554554
$operationDefinitionObjectHandlerProperty->setAccessible(true);
555-
$operationDefinitionObjectHandlerProperty->setValue(null);
555+
$operationDefinitionObjectHandlerProperty->setValue(null, null);
556556

557557
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
558558
$objectManagerProperty->setAccessible(true);
559-
$objectManagerProperty->setValue(null);
559+
$objectManagerProperty->setValue(null, null);
560560

561561
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
562562
}

‎dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Handlers/PersistedObjectHandlerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ public function mockCurlHandler(string $response, array $parserOutput): void
534534
{
535535
$dataObjectHandler = new ReflectionProperty(DataObjectHandler::class, 'INSTANCE');
536536
$dataObjectHandler->setAccessible(true);
537-
$dataObjectHandler->setValue(null);
537+
$dataObjectHandler->setValue(null, null);
538538

539539
$dataProfileSchemaParser = $this->createMock(DataProfileSchemaParser::class);
540540
$dataProfileSchemaParser
@@ -574,7 +574,7 @@ function ($class, $arguments = []) use ($curlHandler, $objectManager, $dataProfi
574574

575575
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
576576
$objectManagerProperty->setAccessible(true);
577-
$objectManagerProperty->setValue($objectManagerMockInstance);
577+
$objectManagerProperty->setValue(null, $objectManagerMockInstance);
578578
}
579579

580580
/**
@@ -589,11 +589,11 @@ public static function tearDownAfterClass(): void
589589
// Clear out Singleton between tests
590590
$persistedObjectHandlerProperty = new ReflectionProperty(PersistedObjectHandler::class, "INSTANCE");
591591
$persistedObjectHandlerProperty->setAccessible(true);
592-
$persistedObjectHandlerProperty->setValue(null);
592+
$persistedObjectHandlerProperty->setValue(null, null);
593593

594594
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
595595
$objectManagerProperty->setAccessible(true);
596-
$objectManagerProperty->setValue(null);
596+
$objectManagerProperty->setValue(null, null);
597597

598598
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
599599
}

‎dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Persist/OperationDataArrayResolverTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ private function mockDataObjectHandler($childDataObject): void
553553

554554
$property = new ReflectionProperty(DataObjectHandler::class, 'INSTANCE');
555555
$property->setAccessible(true);
556-
$property->setValue($instance);
556+
$property->setValue(null, $instance);
557557
}
558558

559559
/**
@@ -578,6 +578,6 @@ private function mockOperationDefinitionObjectHandler($childOperationDefinition)
578578

579579
$property = new ReflectionProperty(OperationDefinitionObjectHandler::class, 'INSTANCE');
580580
$property->setAccessible(true);
581-
$property->setValue($instance);
581+
$property->setValue(null, $instance);
582582
}
583583
}

‎dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Util/DataExtensionUtilTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ private function setMockEntities($mockEntityData): void
136136
{
137137
$property = new ReflectionProperty(DataObjectHandler::class, 'INSTANCE');
138138
$property->setAccessible(true);
139-
$property->setValue(null);
139+
$property->setValue(null, null);
140140

141141
$mockDataProfileSchemaParser = $this->createMock(DataProfileSchemaParser::class);
142142
$mockDataProfileSchemaParser->expects($this->any())
@@ -150,6 +150,6 @@ private function setMockEntities($mockEntityData): void
150150

151151
$property = new ReflectionProperty(ObjectManager::class, 'instance');
152152
$property->setAccessible(true);
153-
$property->setValue($mockObjectManager);
153+
$property->setValue(null, $mockObjectManager);
154154
}
155155
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Page/Handlers/PageObjectHandlerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ private function mockPageObjectHandlerWithData(array $mockData): void
134134
{
135135
$pageObjectHandlerProperty = new ReflectionProperty(PageObjectHandler::class, 'INSTANCE');
136136
$pageObjectHandlerProperty->setAccessible(true);
137-
$pageObjectHandlerProperty->setValue(null);
137+
$pageObjectHandlerProperty->setValue(null, null);
138138

139139
$mockSectionParser = $this->createMock(PageParser::class);
140140
$mockSectionParser
@@ -165,7 +165,7 @@ function (
165165

166166
$property = new ReflectionProperty(ObjectManager::class, 'instance');
167167
$property->setAccessible(true);
168-
$property->setValue($mockObjectManagerInstance);
168+
$property->setValue(null, $mockObjectManagerInstance);
169169
}
170170

171171
/**
@@ -177,11 +177,11 @@ public static function tearDownAfterClass(): void
177177

178178
$pageObjectHandlerProperty = new ReflectionProperty(PageObjectHandler::class, 'INSTANCE');
179179
$pageObjectHandlerProperty->setAccessible(true);
180-
$pageObjectHandlerProperty->setValue(null);
180+
$pageObjectHandlerProperty->setValue(null, null);
181181

182182
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
183183
$objectManagerProperty->setAccessible(true);
184-
$objectManagerProperty->setValue(null);
184+
$objectManagerProperty->setValue(null, null);
185185

186186
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
187187
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Page/Handlers/SectionObjectHandlerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ private function mockSectionObjectHandlerWithData(array $mockData): void
119119
{
120120
$sectionObjectHandlerProperty = new ReflectionProperty(SectionObjectHandler::class, "INSTANCE");
121121
$sectionObjectHandlerProperty->setAccessible(true);
122-
$sectionObjectHandlerProperty->setValue(null);
122+
$sectionObjectHandlerProperty->setValue(null, null);
123123

124124
$mockSectionParser = $this->createMock(SectionParser::class);
125125
$mockSectionParser
@@ -150,7 +150,7 @@ function (
150150

151151
$property = new ReflectionProperty(ObjectManager::class, 'instance');
152152
$property->setAccessible(true);
153-
$property->setValue($mockObjectManagerInstance);
153+
$property->setValue(null, $mockObjectManagerInstance);
154154
}
155155

156156
/**
@@ -162,11 +162,11 @@ public static function tearDownAfterClass(): void
162162

163163
$sectionObjectHandlerProperty = new ReflectionProperty(SectionObjectHandler::class, "INSTANCE");
164164
$sectionObjectHandlerProperty->setAccessible(true);
165-
$sectionObjectHandlerProperty->setValue(null);
165+
$sectionObjectHandlerProperty->setValue(null, null);
166166

167167
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
168168
$objectManagerProperty->setAccessible(true);
169-
$objectManagerProperty->setValue(null);
169+
$objectManagerProperty->setValue(null, null);
170170

171171
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
172172
}

‎dev/tests/unit/Magento/FunctionalTestFramework/StaticCheck/DeprecatedEntityUsageCheckTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ private function mockOperationHandlerWithData(array $mockData): void
297297
'INSTANCE'
298298
);
299299
$operationDefinitionObjectHandlerProperty->setAccessible(true);
300-
$operationDefinitionObjectHandlerProperty->setValue(null);
300+
$operationDefinitionObjectHandlerProperty->setValue(null, null);
301301

302302
$mockOperationParser = $this->createMock(OperationDefinitionParser::class);
303303
$mockOperationParser
@@ -328,7 +328,7 @@ function (
328328

329329
$property = new ReflectionProperty(ObjectManager::class, 'instance');
330330
$property->setAccessible(true);
331-
$property->setValue($mockObjectManagerInstance);
331+
$property->setValue(null, $mockObjectManagerInstance);
332332
}
333333

334334
/**
@@ -343,11 +343,11 @@ public static function tearDownAfterClass(): void
343343
'INSTANCE'
344344
);
345345
$operationDefinitionObjectHandlerProperty->setAccessible(true);
346-
$operationDefinitionObjectHandlerProperty->setValue(null);
346+
$operationDefinitionObjectHandlerProperty->setValue(null, null);
347347

348348
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
349349
$objectManagerProperty->setAccessible(true);
350-
$objectManagerProperty->setValue(null);
350+
$objectManagerProperty->setValue(null, null);
351351
}
352352

353353
/**

‎dev/tests/unit/Magento/FunctionalTestFramework/Suite/Handlers/SuiteObjectHandlerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ private function setMockTestAndSuiteParserOutput(array $testData, array $suiteDa
9090
// clear test object handler value to inject parsed content
9191
$property = new ReflectionProperty(TestObjectHandler::class, 'testObjectHandler');
9292
$property->setAccessible(true);
93-
$property->setValue(null);
93+
$property->setValue(null, null);
9494

9595
// clear suite object handler value to inject parsed content
9696
$property = new ReflectionProperty(SuiteObjectHandler::class, 'instance');
9797
$property->setAccessible(true);
98-
$property->setValue(null);
98+
$property->setValue(null, null);
9999

100100
$mockDataParser = $this->createMock(TestDataParser::class);
101101
$mockDataParser
@@ -128,6 +128,6 @@ function ($clazz) use ($mockDataParser, $mockSuiteDataParser) {
128128

129129
$property = new ReflectionProperty(ObjectManager::class, 'instance');
130130
$property->setAccessible(true);
131-
$property->setValue($instance);
131+
$property->setValue(null, $instance);
132132
}
133133
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Suite/SuiteGeneratorTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ private function setMockTestAndSuiteParserOutput(array $testData, array $suiteDa
369369

370370
$suiteGeneratorServiceProperty = new ReflectionProperty(SuiteGeneratorService::class, 'INSTANCE');
371371
$suiteGeneratorServiceProperty->setAccessible(true);
372-
$suiteGeneratorServiceProperty->setValue($mockSuiteGeneratorService);
372+
$suiteGeneratorServiceProperty->setValue(null, $mockSuiteGeneratorService);
373373

374374
$mockDataParser = $this->createMock(TestDataParser::class);
375375
$mockDataParser
@@ -418,7 +418,7 @@ function (
418418

419419
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
420420
$objectManagerProperty->setAccessible(true);
421-
$objectManagerProperty->setValue($objectManagerMockInstance);
421+
$objectManagerProperty->setValue(null, $objectManagerMockInstance);
422422
}
423423

424424
/**
@@ -430,17 +430,17 @@ private function clearMockResolverProperties(): void
430430
{
431431
$property = new ReflectionProperty(SuiteGenerator::class, 'instance');
432432
$property->setAccessible(true);
433-
$property->setValue(null);
433+
$property->setValue(null, null);
434434

435435
// clear test object handler value to inject parsed content
436436
$property = new ReflectionProperty(TestObjectHandler::class, 'testObjectHandler');
437437
$property->setAccessible(true);
438-
$property->setValue(null);
438+
$property->setValue(null, null);
439439

440440
// clear suite object handler value to inject parsed content
441441
$property = new ReflectionProperty(SuiteObjectHandler::class, 'instance');
442442
$property->setAccessible(true);
443-
$property->setValue(null);
443+
$property->setValue(null, null);
444444
}
445445

446446
/**
@@ -460,11 +460,11 @@ public static function tearDownAfterClass(): void
460460

461461
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
462462
$objectManagerProperty->setAccessible(true);
463-
$objectManagerProperty->setValue(null);
463+
$objectManagerProperty->setValue(null, null);
464464

465465
$suiteGeneratorServiceProperty = new ReflectionProperty(SuiteGeneratorService::class, 'INSTANCE');
466466
$suiteGeneratorServiceProperty->setAccessible(true);
467-
$suiteGeneratorServiceProperty->setValue(null);
467+
$suiteGeneratorServiceProperty->setValue(null, null);
468468

469469
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
470470
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Handlers/ActionGroupObjectHandlerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ private function mockActionGroupObjectHandlerWithData(array $mockData): void
101101
{
102102
$actionGroupObjectHandlerProperty = new ReflectionProperty(ActionGroupObjectHandler::class, 'instance');
103103
$actionGroupObjectHandlerProperty->setAccessible(true);
104-
$actionGroupObjectHandlerProperty->setValue(null);
104+
$actionGroupObjectHandlerProperty->setValue(null, null);
105105

106106
$mockOperationParser = $this->createMock(ActionGroupDataParser::class);
107107
$mockOperationParser
@@ -131,7 +131,7 @@ function (
131131

132132
$property = new ReflectionProperty(ObjectManager::class, 'instance');
133133
$property->setAccessible(true);
134-
$property->setValue($mockObjectManagerInstance);
134+
$property->setValue(null, $mockObjectManagerInstance);
135135
}
136136

137137
/**
@@ -143,10 +143,10 @@ public static function tearDownAfterClass(): void
143143

144144
$actionGroupObjectHandlerProperty = new ReflectionProperty(ActionGroupObjectHandler::class, 'instance');
145145
$actionGroupObjectHandlerProperty->setAccessible(true);
146-
$actionGroupObjectHandlerProperty->setValue(null);
146+
$actionGroupObjectHandlerProperty->setValue(null, null);
147147

148148
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
149149
$objectManagerProperty->setAccessible(true);
150-
$objectManagerProperty->setValue(null);
150+
$objectManagerProperty->setValue(null, null);
151151
}
152152
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Handlers/TestObjectHandlerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ private function mockTestObjectHandler(array $data, ?array $paths = null): void
391391
// clear test object handler value to inject parsed content
392392
$property = new ReflectionProperty(TestObjectHandler::class, 'testObjectHandler');
393393
$property->setAccessible(true);
394-
$property->setValue(null);
394+
$property->setValue(null, null);
395395

396396
$mockDataParser = $this->createMock(TestDataParser::class);
397397
$mockDataParser
@@ -440,7 +440,7 @@ function (
440440

441441
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
442442
$objectManagerProperty->setAccessible(true);
443-
$objectManagerProperty->setValue($objectManagerMockInstance);
443+
$objectManagerProperty->setValue(null, $objectManagerMockInstance);
444444

445445
$resolver = ModuleResolver::getInstance();
446446
$property = new ReflectionProperty(ModuleResolver::class, 'enabledModuleNameAndPaths');

0 commit comments

Comments
 (0)