Changed separated process runner templates to return object instead of array allowing class template to return array of objects when refactored.

Author: akotulu

src/Framework/TestRunner/SeparateProcessTestRunner.php

@@ -14,6 +14,7 @@
 use function file_get_contents;
 use function get_include_path;
 use function hrtime;
+use function is_array;
 use function is_file;
 use function restore_error_handler;
 use function serialize;
@@ -252,22 +253,28 @@ static function (int $errno, string $errstr, string $errfile, int $errline): nev
         }
 
         if ($childResult !== false) {
-            if (!empty($childResult['output'])) {
-                $output = $childResult['output'];
+            if (!is_array($childResult)) {
+                $childResult = [$childResult];
             }
 
-            Facade::instance()->forward($childResult['events']);
-            PassedTests::instance()->import($childResult['passedTests']);
+            foreach ($childResult as $result) {
+                if (!empty($result->output)) {
+                    $output = $result->output;
+                }
 
-            assert($test instanceof TestCase);
+                Facade::instance()->forward($result->events);
+                PassedTests::instance()->import($result->passedTests);
+
+                assert($test instanceof TestCase);
 
-            $test->setResult($childResult['testResult']);
-            $test->addToAssertionCount($childResult['numAssertions']);
+                $test->setResult($result->testResult);
+                $test->addToAssertionCount($result->numAssertions);
 
-            if (CodeCoverage::instance()->isActive() && $childResult['codeCoverage'] instanceof \SebastianBergmann\CodeCoverage\CodeCoverage) {
-                CodeCoverage::instance()->codeCoverage()->merge(
-                    $childResult['codeCoverage'],
-                );
+                if (CodeCoverage::instance()->isActive() && $result->codeCoverage instanceof \SebastianBergmann\CodeCoverage\CodeCoverage) {
+                    CodeCoverage::instance()->codeCoverage()->merge(
+                        $result->codeCoverage,
+                    );
+                }
             }
         }
 

src/Framework/TestRunner/templates/class.tpl

@@ -105,7 +105,7 @@ function __phpunit_run_isolated_test()
     file_put_contents(
         '{processResultFile}',
         serialize(
-            [
+            (object)[
                 'testResult'    => $test->result(),
                 'codeCoverage'  => {collectCodeCoverageInformation} ? CodeCoverage::instance()->codeCoverage() : null,
                 'numAssertions' => $test->numberOfAssertionsPerformed(),

src/Framework/TestRunner/templates/method.tpl

@@ -105,7 +105,7 @@ function __phpunit_run_isolated_test()
     file_put_contents(
         '{processResultFile}',
         serialize(
-            [
+            (object)[
                 'testResult'    => $test->result(),
                 'codeCoverage'  => {collectCodeCoverageInformation} ? CodeCoverage::instance()->codeCoverage() : null,
                 'numAssertions' => $test->numberOfAssertionsPerformed(),

tests/end-to-end/regression/5884/tests/FooTest.php

@@ -61,10 +61,11 @@ public function testStreamToNonWritableFileWithPHPUnitErrorHandler(): void
 
         // Now verify the original file is unchanged.
         $contents = file_get_contents($filename);
-        $this->assertSame('foo', $contents);
 
         chmod($filename, 0o755);
         unlink($filename);
+
+        $this->assertSame('foo', $contents);
     }
 
     #[WithoutErrorHandler]
@@ -85,10 +86,11 @@ public function testStreamToNonWritableFileWithoutPHPUnitErrorHandler(): void
 
         // Now verify the original file is unchanged.
         $contents = file_get_contents($filename);
-        $this->assertSame('foo', $contents);
 
         chmod($filename, 0o755);
         unlink($filename);
+
+        $this->assertSame('foo', $contents);
     }
 
     public function testStreamToInvalidFile(): void