Skip to content

Commit a4712f7

Browse files
sandesh-shivakumarsandesh-shivakumar
authored
Merge branch 'upgrade-php-phpunit' into ACQE-9028
2 parents 704acff + 913ee55 commit a4712f7

37 files changed

+9
-128
lines changed

‎.github/workflows/main.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
php-versions: ['8.3', '8.4']
15+
php-versions: ['8.3', '8.4', '8.5']
1616
steps:
1717
- uses: actions/checkout@v2
1818

@@ -54,7 +54,7 @@ jobs:
5454
strategy:
5555
fail-fast: false
5656
matrix:
57-
php-versions: ['8.3', '8.4']
57+
php-versions: ['8.3', '8.4', '8.5']
5858
steps:
5959
- uses: actions/checkout@v2
6060

@@ -86,7 +86,7 @@ jobs:
8686
strategy:
8787
fail-fast: false
8888
matrix:
89-
php-versions: ['8.3', '8.4']
89+
php-versions: ['8.3', '8.4', '8.5']
9090
steps:
9191
- uses: actions/checkout@v2
9292

@@ -118,8 +118,7 @@ jobs:
118118
strategy:
119119
fail-fast: false
120120
matrix:
121-
php-versions: ['8.3', '8.4']
122-
121+
php-versions: ['8.3', '8.4', '8.5']
123122
services:
124123
chrome:
125124
image: selenium/standalone-chrome:3.141.59-zirconium
@@ -133,6 +132,7 @@ jobs:
133132
with:
134133
php-version: ${{ matrix.php-versions }}
135134
extensions: curl, dom, intl, json, openssl
135+
ini-values: register_argc_argv=On
136136

137137
- name: Cache Composer packages
138138
id: composer-cache

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,14 @@ protected function tearDown(): void
2828
{
2929
$handler = TestObjectHandler::getInstance();
3030
$testsProperty = new ReflectionProperty(TestObjectHandler::class, 'tests');
31-
$testsProperty->setAccessible(true);
3231
$testsProperty->setValue($handler, []);
3332
$testObjectHandlerProperty = new ReflectionProperty(TestObjectHandler::class, 'testObjectHandler');
34-
$testObjectHandlerProperty->setAccessible(true);
3533
$testObjectHandlerProperty->setValue(null, $handler);
3634

3735
$handler = SuiteObjectHandler::getInstance();
3836
$suiteObjectsProperty = new ReflectionProperty(SuiteObjectHandler::class, 'suiteObjects');
39-
$suiteObjectsProperty->setAccessible(true);
4037
$suiteObjectsProperty->setValue($handler, []);
4138
$suiteObjectHandlerProperty = new ReflectionProperty(SuiteObjectHandler::class, 'instance');
42-
$suiteObjectHandlerProperty->setAccessible(true);
4339
$suiteObjectHandlerProperty->setValue(null, $handler);
4440
}
4541

@@ -213,33 +209,27 @@ public function mockHandlers(array $testArray, array $suiteArray): void
213209
// bypass the initTestData method
214210
$testObjectHandlerClass = new ReflectionClass(TestObjectHandler::class);
215211
$constructor = $testObjectHandlerClass->getConstructor();
216-
$constructor->setAccessible(true);
217212
$testObjectHandlerObject = $testObjectHandlerClass->newInstanceWithoutConstructor();
218213
$constructor->invoke($testObjectHandlerObject);
219214

220215
$testObjectHandlerProperty = new ReflectionProperty(TestObjectHandler::class, 'testObjectHandler');
221-
$testObjectHandlerProperty->setAccessible(true);
222216
$testObjectHandlerProperty->setValue(null, $testObjectHandlerObject);
223217

224218
$handler = TestObjectHandler::getInstance();
225219
$property = new ReflectionProperty(TestObjectHandler::class, 'tests');
226-
$property->setAccessible(true);
227220
$property->setValue($handler, $testArray);
228221

229222
// bypass the initTestData method
230223
$suiteObjectHandlerClass = new ReflectionClass(SuiteObjectHandler::class);
231224
$constructor = $suiteObjectHandlerClass->getConstructor();
232-
$constructor->setAccessible(true);
233225
$suiteObjectHandlerObject = $suiteObjectHandlerClass->newInstanceWithoutConstructor();
234226
$constructor->invoke($suiteObjectHandlerObject);
235227

236228
$suiteObjectHandlerProperty = new ReflectionProperty(SuiteObjectHandler::class, 'instance');
237-
$suiteObjectHandlerProperty->setAccessible(true);
238229
$suiteObjectHandlerProperty->setValue(null, $suiteObjectHandlerObject);
239230

240231
$handler = SuiteObjectHandler::getInstance();
241232
$property = new ReflectionProperty(SuiteObjectHandler::class, 'suiteObjects');
242-
$property->setAccessible(true);
243233
$property->setValue($handler, $suiteArray);
244234
}
245235

@@ -256,7 +246,6 @@ public function callTestConfig(array $testArray): string
256246
$command = new BaseGenerateCommand();
257247
$class = new ReflectionClass($command);
258248
$method = $class->getMethod('getTestAndSuiteConfiguration');
259-
$method->setAccessible(true);
260249

261250
return $method->invokeArgs($command, [$testArray]);
262251
}
@@ -274,7 +263,6 @@ public function callGroupConfig(array $groupArray): string
274263
$command = new BaseGenerateCommand();
275264
$class = new ReflectionClass($command);
276265
$method = $class->getMethod('getGroupAndSuiteConfiguration');
277-
$method->setAccessible(true);
278266

279267
return $method->invokeArgs($command, [$groupArray]);
280268
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public function testParseConfigParallelOptions($time, $groups, $expected): void
2626
$command = new GenerateTestsCommand();
2727
$class = new \ReflectionClass($command);
2828
$method = $class->getMethod('parseConfigParallelOptions');
29-
$method->setAccessible(true);
3029

3130
if (is_array($expected)) {
3231
$actual = $method->invokeArgs($command, [$time, $groups]);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ private function invokePrivateMethod(&$object, $methodName, array $parameters =
4747
{
4848
$reflection = new \ReflectionClass(get_class($object));
4949
$method = $reflection->getMethod($methodName);
50-
$method->setAccessible(true);
5150
return $method->invokeArgs($object, $parameters);
5251
}
5352

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

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

330329
$mockDataProfileSchemaParser = $this->createMock(DataProfileSchemaParser::class);
@@ -353,7 +352,6 @@ function (
353352
);
354353

355354
$property = new ReflectionProperty(ObjectManager::class, 'instance');
356-
$property->setAccessible(true);
357355
$property->setValue(null, $mockObjectManagerInstance);
358356
}
359357

@@ -365,11 +363,9 @@ public static function tearDownAfterClass(): void
365363
parent::tearDownAfterClass();
366364

367365
$dataObjectHandlerProperty = new ReflectionProperty(DataObjectHandler::class, "INSTANCE");
368-
$dataObjectHandlerProperty->setAccessible(true);
369366
$dataObjectHandlerProperty->setValue(null, null);
370367

371368
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
372-
$objectManagerProperty->setAccessible(true);
373369
$objectManagerProperty->setValue(null, null);
374370

375371
TestLoggingUtil::getInstance()->clearMockLoggingUtil();

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,6 @@ private function mockOperationHandlerWithData(array $mockData): void
505505
OperationDefinitionObjectHandler::class,
506506
'INSTANCE'
507507
);
508-
$operationDefinitionObjectHandlerProperty->setAccessible(true);
509508
$operationDefinitionObjectHandlerProperty->setValue(null, null);
510509

511510
$mockOperationParser = $this->createMock(OperationDefinitionParser::class);
@@ -534,7 +533,6 @@ function (
534533
);
535534

536535
$property = new ReflectionProperty(ObjectManager::class, 'instance');
537-
$property->setAccessible(true);
538536
$property->setValue(null, $mockObjectManagerInstance);
539537
}
540538

@@ -549,11 +547,9 @@ public static function tearDownAfterClass(): void
549547
OperationDefinitionObjectHandler::class,
550548
'INSTANCE'
551549
);
552-
$operationDefinitionObjectHandlerProperty->setAccessible(true);
553550
$operationDefinitionObjectHandlerProperty->setValue(null, null);
554551

555552
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
556-
$objectManagerProperty->setAccessible(true);
557553
$objectManagerProperty->setValue(null, null);
558554

559555
TestLoggingUtil::getInstance()->clearMockLoggingUtil();

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,6 @@ public static function entityDataProvider(): array
535535
public function mockCurlHandler(string $response, array $parserOutput): void
536536
{
537537
$dataObjectHandler = new ReflectionProperty(DataObjectHandler::class, 'INSTANCE');
538-
$dataObjectHandler->setAccessible(true);
539538
$dataObjectHandler->setValue(null, null);
540539

541540
$dataProfileSchemaParser = $this->createMock(DataProfileSchemaParser::class);
@@ -573,7 +572,6 @@ function ($class, $arguments = []) use ($curlHandler, $objectManager, $dataProfi
573572
);
574573

575574
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
576-
$objectManagerProperty->setAccessible(true);
577575
$objectManagerProperty->setValue(null, $objectManagerMockInstance);
578576
}
579577

@@ -588,11 +586,9 @@ public static function tearDownAfterClass(): void
588586

589587
// Clear out Singleton between tests
590588
$persistedObjectHandlerProperty = new ReflectionProperty(PersistedObjectHandler::class, "INSTANCE");
591-
$persistedObjectHandlerProperty->setAccessible(true);
592589
$persistedObjectHandlerProperty->setValue(null, null);
593590

594591
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
595-
$objectManagerProperty->setAccessible(true);
596592
$objectManagerProperty->setValue(null, null);
597593

598594
TestLoggingUtil::getInstance()->clearMockLoggingUtil();

‎dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Handlers/SecretStorage/AwsSecretsManagerStorageTest.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ function ($name, $args) use ($result) {
5353
$credentialStorage = new AwsSecretsManagerStorage($testRegion, $testProfile);
5454
$reflection = new ReflectionClass($credentialStorage);
5555
$reflection_property = $reflection->getProperty('client');
56-
$reflection_property->setAccessible(true);
5756
$reflection_property->setValue($credentialStorage, $mockClient);
5857

5958
// Test getEncryptedValue()

‎dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Handlers/SecretStorage/FileStorageTest.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,10 @@ public function testBasicEncryptDecrypt(): void
3232

3333
// Emulate initialize() function result with the test credentials
3434
$reflectionMethod = $reflection->getMethod('encryptCredFileContents');
35-
$reflectionMethod->setAccessible(true);
3635
$secretData = $reflectionMethod->invokeArgs($fileStorage, [$cred]);
3736

3837
// Set encrypted test credentials to the private 'secretData' property
3938
$reflectionProperty = $reflection->getProperty('secretData');
40-
$reflectionProperty->setAccessible(true);
4139
$reflectionProperty->setValue($fileStorage, $secretData);
4240

4341
$encryptedCred = $fileStorage->getEncryptedValue($testKey);
@@ -69,12 +67,10 @@ public function testEmptyValueEncryptDecrypt(): void
6967

7068
// Emulate initialize() function result with the test credentials
7169
$reflectionMethod = $reflection->getMethod('encryptCredFileContents');
72-
$reflectionMethod->setAccessible(true);
7370
$secretData = $reflectionMethod->invokeArgs($fileStorage, [$cred]);
7471

7572
// Set encrypted test credentials to the private 'secretData' property
7673
$reflectionProperty = $reflection->getProperty('secretData');
77-
$reflectionProperty->setAccessible(true);
7874
$reflectionProperty->setValue($fileStorage, $secretData);
7975

8076
$fileStorage->getEncryptedValue($testKey);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,6 @@ private function mockDataObjectHandler($childDataObject): void
561561
}
562562

563563
$property = new ReflectionProperty(DataObjectHandler::class, 'INSTANCE');
564-
$property->setAccessible(true);
565564
$property->setValue(null, $instance);
566565
}
567566

@@ -586,7 +585,6 @@ private function mockOperationDefinitionObjectHandler($childOperationDefinition)
586585
}
587586

588587
$property = new ReflectionProperty(OperationDefinitionObjectHandler::class, 'INSTANCE');
589-
$property->setAccessible(true);
590588
$property->setValue(null, $instance);
591589
}
592590
}

0 commit comments

Comments
 (0)