MCLOUD-13149: Fixes for private property $id in test class + cosmetic fix

Author: prateek-karanpuria-adobe

src/Test/Unit/Command/Process/ApplyRequiredTest.php

@@ -152,7 +152,7 @@ public function testApplyWithException()
             $this->conflictProcessor->expects($this->once())
             ->method('process')
             ->with($outputMock, $patch, [], 'Applier error message')
-            ->willReturnCallback(function($output, $patch, $data = '', string $errorMessage) use ($outputMock, $patch2, $patch1) {
+            ->willReturnCallback(function($output, $patch, string $errorMessage, $data = '') use ($outputMock, $patch2, $patch1) {
                 if ($output === $outputMock && $patch === $patch2 && $data === $patch1 && $errorMessage === 'Applier error message') {
                     throw new RuntimeException('Error message');
                 }

src/Test/Unit/Patch/Pool/OptionalPoolTest.php

@@ -319,15 +319,31 @@ private function caseReturnPatchListUnique(): array
      */
     private function createPatch(string $id, array $require = [], string $replacedWith = '')
     {
-        $patch = $this->createMock(Patch::class);
+        //$patch = $this->createMock(Patch::class);
+        $patch = $this->getMockBuilder(Patch::class)
+                    ->disableOriginalConstructor()
+                    ->getMock();
+
         $patch->method('getId')->willReturn($id);
         $patch->method('getRequire')->willReturn($require);
         $patch->method('getReplacedWith')->willReturn($replacedWith);
         $patch->method('getOrigin')->willReturn(SupportCollector::ORIGIN);
 
         // To make mock object unique for assertions and array operations.
-        $patch->id = microtime();
-        $patch->method('__toString')->willReturn($patch->id);
+        // Use Reflection to set `$id` as a public property
+        $reflection = new \ReflectionClass($patch);
+        if (!$reflection->hasProperty('id')) {
+            $idProperty = $reflection->getProperty('id');
+
+            if ($idProperty) {
+                $idProperty->setAccessible(true); // Make the property accessible
+                $idProperty->setValue($patch, microtime());
+            }
+        } else {
+            $patch->id = microtime();
+        }
+
+        $patch->method('__toString')->willReturn((string) $patch->id);
 
         return $patch;
     }