Skip to content

Commit 913ee55

Browse files
sandesh-shivakumarsandesh-shivakumar
authored
Merge pull request #61 from magento-gl/ACQE-9025
Php Upgrade
2 parents 4e67223 + 7e8630a commit 913ee55

38 files changed

+9
-141
lines changed

‎.github/workflows/main.yml‎

Lines changed: 5 additions & 4 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.2', '8.3', '8.4']
15+
php-versions: ['8.2', '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.2', '8.3', '8.4']
57+
php-versions: ['8.2', '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.2', '8.3', '8.4']
89+
php-versions: ['8.2', '8.3', '8.4', '8.5']
9090
steps:
9191
- uses: actions/checkout@v2
9292

@@ -118,7 +118,7 @@ jobs:
118118
strategy:
119119
fail-fast: false
120120
matrix:
121-
php-versions: ['8.2', '8.3', '8.4']
121+
php-versions: ['8.2', '8.3', '8.4', '8.5']
122122

123123
services:
124124
chrome:
@@ -133,6 +133,7 @@ jobs:
133133
with:
134134
php-version: ${{ matrix.php-versions }}
135135
extensions: curl, dom, intl, json, openssl
136+
ini-values: register_argc_argv=On
136137

137138
- name: Cache Composer packages
138139
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
@@ -25,7 +25,6 @@ public function testParseConfigParallelOptions($time, $groups, $expected): void
2525
$command = new GenerateTestsCommand();
2626
$class = new \ReflectionClass($command);
2727
$method = $class->getMethod('parseConfigParallelOptions');
28-
$method->setAccessible(true);
2928

3029
if (is_array($expected)) {
3130
$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);
@@ -355,7 +354,6 @@ function (
355354
);
356355

357356
$property = new ReflectionProperty(ObjectManager::class, 'instance');
358-
$property->setAccessible(true);
359357
$property->setValue(null, $mockObjectManagerInstance);
360358
}
361359

@@ -367,11 +365,9 @@ public static function tearDownAfterClass(): void
367365
parent::tearDownAfterClass();
368366

369367
$dataObjectHandlerProperty = new ReflectionProperty(DataObjectHandler::class, "INSTANCE");
370-
$dataObjectHandlerProperty->setAccessible(true);
371368
$dataObjectHandlerProperty->setValue(null, null);
372369

373370
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
374-
$objectManagerProperty->setAccessible(true);
375371
$objectManagerProperty->setValue(null, null);
376372

377373
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
@@ -506,7 +506,6 @@ private function mockOperationHandlerWithData(array $mockData): void
506506
OperationDefinitionObjectHandler::class,
507507
'INSTANCE'
508508
);
509-
$operationDefinitionObjectHandlerProperty->setAccessible(true);
510509
$operationDefinitionObjectHandlerProperty->setValue(null, null);
511510

512511
$mockOperationParser = $this->createMock(OperationDefinitionParser::class);
@@ -537,7 +536,6 @@ function (
537536
);
538537

539538
$property = new ReflectionProperty(ObjectManager::class, 'instance');
540-
$property->setAccessible(true);
541539
$property->setValue(null, $mockObjectManagerInstance);
542540
}
543541

@@ -552,11 +550,9 @@ public static function tearDownAfterClass(): void
552550
OperationDefinitionObjectHandler::class,
553551
'INSTANCE'
554552
);
555-
$operationDefinitionObjectHandlerProperty->setAccessible(true);
556553
$operationDefinitionObjectHandlerProperty->setValue(null, null);
557554

558555
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
559-
$objectManagerProperty->setAccessible(true);
560556
$objectManagerProperty->setValue(null, null);
561557

562558
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
@@ -534,7 +534,6 @@ public static function entityDataProvider(): array
534534
public function mockCurlHandler(string $response, array $parserOutput): void
535535
{
536536
$dataObjectHandler = new ReflectionProperty(DataObjectHandler::class, 'INSTANCE');
537-
$dataObjectHandler->setAccessible(true);
538537
$dataObjectHandler->setValue(null, null);
539538

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

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

@@ -589,11 +587,9 @@ public static function tearDownAfterClass(): void
589587

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

595592
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
596-
$objectManagerProperty->setAccessible(true);
597593
$objectManagerProperty->setValue(null, null);
598594

599595
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
@@ -47,7 +47,6 @@ public function testEncryptAndDecrypt()
4747
$credentialStorage = new AwsSecretsManagerStorage($testRegion, $testProfile);
4848
$reflection = new ReflectionClass($credentialStorage);
4949
$reflection_property = $reflection->getProperty('client');
50-
$reflection_property->setAccessible(true);
5150
$reflection_property->setValue($credentialStorage, $mockClient);
5251

5352
// 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
@@ -31,12 +31,10 @@ public function testBasicEncryptDecrypt(): void
3131

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

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

4240
$encryptedCred = $fileStorage->getEncryptedValue($testKey);
@@ -67,12 +65,10 @@ public function testEmptyValueEncryptDecrypt(): void
6765

6866
// Emulate initialize() function result with the test credentials
6967
$reflectionMethod = $reflection->getMethod('encryptCredFileContents');
70-
$reflectionMethod->setAccessible(true);
7168
$secretData = $reflectionMethod->invokeArgs($fileStorage, [$cred]);
7269

7370
// Set encrypted test credentials to the private 'secretData' property
7471
$reflectionProperty = $reflection->getProperty('secretData');
75-
$reflectionProperty->setAccessible(true);
7672
$reflectionProperty->setValue($fileStorage, $secretData);
7773

7874
$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
@@ -553,7 +553,6 @@ private function mockDataObjectHandler($childDataObject): void
553553
}
554554

555555
$property = new ReflectionProperty(DataObjectHandler::class, 'INSTANCE');
556-
$property->setAccessible(true);
557556
$property->setValue(null, $instance);
558557
}
559558

@@ -578,7 +577,6 @@ private function mockOperationDefinitionObjectHandler($childOperationDefinition)
578577
}
579578

580579
$property = new ReflectionProperty(OperationDefinitionObjectHandler::class, 'INSTANCE');
581-
$property->setAccessible(true);
582580
$property->setValue(null, $instance);
583581
}
584582
}

0 commit comments

Comments
 (0)