ACQE-5710 : Deprecation error Fix

manjusha729 · manjusha729 · commit 0edfcece7b7d · 2023-11-09T13:09:19.000+05:30
diff --git a/dev/tests/_bootstrap.php b/dev/tests/_bootstrap.php
@@ -36,7 +36,7 @@
 
 foreach ($TEST_ENVS as $key => $value) {
     $_ENV[$key] = $value;
-    putenv("{$key}=${value}");
+    putenv("{$key}={$value}");
 }
 
 // Add our test module to the allowlist
diff --git a/dev/tests/unit/Util/TestLoggingUtil.php b/dev/tests/unit/Util/TestLoggingUtil.php
@@ -12,6 +12,7 @@
 use Monolog\Handler\TestHandler;
 use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
+use ReflectionClass;
 
 class TestLoggingUtil extends TestCase
 {
@@ -64,7 +65,7 @@ public function setMockLoggingUtil(): void
 
         $property = new ReflectionProperty(LoggingUtil::class, 'instance');
         $property->setAccessible(true);
-        $property->setValue($mockLoggingUtil);
+        $property->setValue(null, $mockLoggingUtil);
     }
 
     /**
@@ -122,8 +123,7 @@ public function validateMockLogStatmentRegex(string $type, string $regex, array
      */
     public function clearMockLoggingUtil(): void
     {
-        $property = new ReflectionProperty(LoggingUtil::class, 'instance');
-        $property->setAccessible(true);
-        $property->setValue(null);
+        $reflectionClass = new ReflectionClass(LoggingUtil::class);
+        $reflectionClass->setStaticPropertyValue('instance', null);
     }
 }
diff --git a/dev/tests/verification/Tests/ResilientGenerationTest.php b/dev/tests/verification/Tests/ResilientGenerationTest.php
@@ -76,19 +76,19 @@ public function setUp(): void
 
         $property = new \ReflectionProperty(SuiteGenerator::class, "instance");
         $property->setAccessible(true);
-        $property->setValue(null);
+        $property->setValue(null,null);
 
         $property = new \ReflectionProperty(DirSetupUtil::class, "DIR_CONTEXT");
         $property->setAccessible(true);
-        $property->setValue([]);
+        $property->setValue(null, []);
 
         $property = new \ReflectionProperty(SuiteObjectHandler::class, "instance");
         $property->setAccessible(true);
-        $property->setValue(null);
+        $property->setValue(null, null);
 
         $property = new \ReflectionProperty(TestObjectHandler::class, "testObjectHandler");
         $property->setAccessible(true);
-        $property->setValue(null);
+        $property->setValue(null, null);
     }
 
     /**
@@ -261,19 +261,19 @@ public function tearDown(): void
 
         $property = new \ReflectionProperty(SuiteGenerator::class, "instance");
         $property->setAccessible(true);
-        $property->setValue(null);
+        $property->setValue(null, null);
 
         $property = new \ReflectionProperty(DirSetupUtil::class, "DIR_CONTEXT");
         $property->setAccessible(true);
-        $property->setValue([]);
+        $property->setValue(null, []);
 
         $property = new \ReflectionProperty(SuiteObjectHandler::class, "instance");
         $property->setAccessible(true);
-        $property->setValue(null);
+        $property->setValue(null, null);
 
         $property = new \ReflectionProperty(TestObjectHandler::class, "testObjectHandler");
         $property->setAccessible(true);
-        $property->setValue(null);
+        $property->setValue(null, null);
     }
 
     /**
diff --git a/dev/tests/verification/Tests/StaticCheck/DeprecationStaticCheckTest.php b/dev/tests/verification/Tests/StaticCheck/DeprecationStaticCheckTest.php
@@ -10,6 +10,7 @@
 use ReflectionProperty;
 use Symfony\Component\Console\Input\InputInterface;
 use tests\util\MftfStaticTestCase;
+use ReflectionClass;
 
 class DeprecationStaticCheckTest extends MftfStaticTestCase
 {
@@ -33,10 +34,8 @@ public function testDeprecatedEntityUsageCheck()
         $staticCheck = new DeprecatedEntityUsageCheck();
 
         $input = $this->mockInputInterface(self::TEST_MODULE_PATH);
-        $property = new ReflectionProperty(StaticChecksList::class, 'errorFilesPath');
-        $property->setAccessible(true);
-        $property->setValue(self::STATIC_RESULTS_DIR);
-
+        $reflectionClass = new ReflectionClass(StaticChecksList::class);
+        $reflectionClass->setStaticPropertyValue('errorFilesPath', self::STATIC_RESULTS_DIR);
         /** @var InputInterface $input */
         $staticCheck->execute($input);
 
@@ -55,8 +54,7 @@ public function testDeprecatedEntityUsageCheck()
      */
     public function tearDown(): void
     {
-        $property = new ReflectionProperty(StaticChecksList::class, 'errorFilesPath');
-        $property->setAccessible(true);
-        $property->setValue(null);
+        $reflectionClass = new ReflectionClass(StaticChecksList::class);
+        $reflectionClass->setStaticPropertyValue('errorFilesPath', null);
     }
 }
diff --git a/dev/tests/verification/Tests/StaticCheck/PauseActionStaticCheckTest.php b/dev/tests/verification/Tests/StaticCheck/PauseActionStaticCheckTest.php
@@ -8,9 +8,11 @@
 use Exception;
 use Magento\FunctionalTestingFramework\StaticCheck\PauseActionUsageCheck;
 use Magento\FunctionalTestingFramework\StaticCheck\StaticChecksList;
+use Magento\FunctionalTestingFramework\Suite\Handlers\SuiteObjectHandler;
 use ReflectionProperty;
 use Symfony\Component\Console\Input\InputInterface;
 use tests\util\MftfStaticTestCase;
+use ReflectionClass;
 
 class PauseActionStaticCheckTest extends MftfStaticTestCase
 {
@@ -34,10 +36,8 @@ public function testPauseActionUsageCheck()
         $staticCheck = new PauseActionUsageCheck();
 
         $input = $this->mockInputInterface(self::TEST_MODULE_PATH);
-
-        $property = new ReflectionProperty(StaticChecksList::class, 'errorFilesPath');
-        $property->setAccessible(true);
-        $property->setValue(self::STATIC_RESULTS_DIR);
+        $reflectionClass = new ReflectionClass(StaticChecksList::class);
+        $reflectionClass->setStaticPropertyValue('errorFilesPath', self::STATIC_RESULTS_DIR);
 
         /** @var InputInterface $input */
         $staticCheck->execute($input);
@@ -57,8 +57,7 @@ public function testPauseActionUsageCheck()
      */
     public static function tearDownAfterClass(): void
     {
-        $property = new ReflectionProperty(StaticChecksList::class, 'errorFilesPath');
-        $property->setAccessible(true);
-        $property->setValue(null);
+        $reflectionClass = new ReflectionClass(StaticChecksList::class);
+        $reflectionClass->setStaticPropertyValue('errorFilesPath', null);
     }
 }
diff --git a/dev/tests/verification/Tests/SuiteGenerationTest.php b/dev/tests/verification/Tests/SuiteGenerationTest.php
@@ -493,7 +493,7 @@ public function tearDown(): void
 
         $property = new \ReflectionProperty(DirSetupUtil::class, "DIR_CONTEXT");
         $property->setAccessible(true);
-        $property->setValue([]);
+        $property->setValue(null, []);
     }
 
     /**
diff --git a/src/Magento/FunctionalTestingFramework/Util/Logger/LoggingUtil.php b/src/Magento/FunctionalTestingFramework/Util/Logger/LoggingUtil.php
@@ -36,10 +36,10 @@ public static function getInstance(): LoggingUtil
         if (self::$instance === null) {
             self::$instance = new LoggingUtil();
         }
-
         return self::$instance;
     }
 
+
     /**
      * Avoids instantiation of LoggingUtil by new.
      * @return void
diff --git a/src/Magento/FunctionalTestingFramework/Util/Sorter/ParallelGroupSorter.php b/src/Magento/FunctionalTestingFramework/Util/Sorter/ParallelGroupSorter.php
@@ -487,8 +487,8 @@ private function splitTestSuite($suiteName, $tests, $maxTime)
             }
 
             $group = $this->createTestGroup($maxTime, $test, $size, $availableTests);
-            $splitSuites["{$suiteName}_${splitCount}_G"] = $group;
-            $this->addSuiteToConfig($suiteName, "{$suiteName}_${splitCount}_G", $group);
+            $splitSuites["{$suiteName}_{$splitCount}_G"] = $group;
+            $this->addSuiteToConfig($suiteName, "{$suiteName}_{$splitCount}_G", $group);
 
             $availableTests = array_diff_key($availableTests, $group);
             $splitCount++;

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`
`37`	`37`	`foreach ($TEST_ENVS as $key => $value) {`
`38`	`38`	`$_ENV[$key] = $value;`
`39`		`- putenv("{$key}=${value}");`
	`39`	`+ putenv("{$key}={$value}");`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`// Add our test module to the allowlist`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`use Monolog\Handler\TestHandler;`
`13`	`13`	`use PHPUnit\Framework\TestCase;`
`14`	`14`	`use ReflectionProperty;`
	`15`	`+use ReflectionClass;`
`15`	`16`
`16`	`17`	`class TestLoggingUtil extends TestCase`
`17`	`18`	`{`
`@@ -64,7 +65,7 @@ public function setMockLoggingUtil(): void`
`64`	`65`
`65`	`66`	`$property = new ReflectionProperty(LoggingUtil::class, 'instance');`
`66`	`67`	`$property->setAccessible(true);`
`67`		`- $property->setValue($mockLoggingUtil);`
	`68`	`+ $property->setValue(null, $mockLoggingUtil);`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`/**`
`@@ -122,8 +123,7 @@ public function validateMockLogStatmentRegex(string $type, string $regex, array`
`122`	`123`	`*/`
`123`	`124`	`public function clearMockLoggingUtil(): void`
`124`	`125`	`{`
`125`		`- $property = new ReflectionProperty(LoggingUtil::class, 'instance');`
`126`		`- $property->setAccessible(true);`
`127`		`- $property->setValue(null);`
	`126`	`+ $reflectionClass = new ReflectionClass(LoggingUtil::class);`
	`127`	`+ $reflectionClass->setStaticPropertyValue('instance', null);`
`128`	`128`	`}`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ public function tearDown(): void`
`493`	`493`
`494`	`494`	`$property = new \ReflectionProperty(DirSetupUtil::class, "DIR_CONTEXT");`
`495`	`495`	`$property->setAccessible(true);`
`496`		`- $property->setValue([]);`
	`496`	`+ $property->setValue(null, []);`
`497`	`497`	`}`
`498`	`498`
`499`	`499`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,10 @@ public static function getInstance(): LoggingUtil`
`36`	`36`	`if (self::$instance === null) {`
`37`	`37`	`self::$instance = new LoggingUtil();`
`38`	`38`	`}`
`39`		`-`
`40`	`39`	`return self::$instance;`
`41`	`40`	`}`
`42`	`41`
	`42`	`+`
`43`	`43`	`/**`
`44`	`44`	`* Avoids instantiation of LoggingUtil by new.`
`45`	`45`	`* @return void`
Original file line number	Diff line number	Diff line change
`@@ -487,8 +487,8 @@ private function splitTestSuite($suiteName, $tests, $maxTime)`
`487`	`487`	`}`
`488`	`488`
`489`	`489`	`$group = $this->createTestGroup($maxTime, $test, $size, $availableTests);`
`490`		`- $splitSuites["{$suiteName}_${splitCount}_G"] = $group;`
`491`		`- $this->addSuiteToConfig($suiteName, "{$suiteName}_${splitCount}_G", $group);`
	`490`	`+ $splitSuites["{$suiteName}_{$splitCount}_G"] = $group;`
	`491`	`+ $this->addSuiteToConfig($suiteName, "{$suiteName}_{$splitCount}_G", $group);`
`492`	`492`
`493`	`493`	`$availableTests = array_diff_key($availableTests, $group);`
`494`	`494`	`$splitCount++;`