Fix JUnit missing PHPT results

src/Runner/PhptTestCase.php

@@ -62,6 +62,11 @@ class PhptTestCase implements Test, SelfDescribing
      */
     private $phpUtil;
 
+    /**
+     * @var string
+     */
+    private $output = '';
+
     /**
      * Constructs a test case with the given filename.
      *
@@ -155,8 +160,9 @@ public function run(TestResult $result = null): TestResult
 
         Timer::start();
 
-        $jobResult = $this->phpUtil->runJob($code, $this->stringifyIni($settings));
-        $time      = Timer::stop();
+        $jobResult    = $this->phpUtil->runJob($code, $this->stringifyIni($settings));
+        $time         = Timer::stop();
+        $this->output = $jobResult['stdout'] ?? '';
 
         if ($result->getCollectCodeCoverageInformation() && ($coverage = $this->cleanupForCoverage())) {
             $result->getCodeCoverage()->append($coverage, $this, true, [], [], true);
@@ -202,6 +208,26 @@ public function toString(): string
         return $this->filename;
     }
 
+    public function usesDataProvider(): bool
+    {
+        return false;
+    }
+
+    public function getNumAssertions(): int
+    {
+        return 1;
+    }
+
+    public function getActualOutput(): string
+    {
+        return $this->output;
+    }
+
+    public function hasOutput(): bool
+    {
+        return !empty($this->output);
+    }
+
     /**
      * Parse --INI-- section key value pairs and return as array.
      *
@@ -475,8 +501,8 @@ private function render(string $code): string
 
     private function getCoverageFiles(): array
     {
-        $baseDir          = \dirname(\realpath($this->filename)) . \DIRECTORY_SEPARATOR;
-        $basename         = \basename($this->filename, 'phpt');
+        $baseDir  = \dirname(\realpath($this->filename)) . \DIRECTORY_SEPARATOR;
+        $basename = \basename($this->filename, 'phpt');
 
         return [
             'coverage' => $baseDir . $basename . 'coverage',
@@ -507,7 +533,10 @@ private function renderForCoverage(string &$job): void
         $globals = '';
 
         if (!empty($GLOBALS['__PHPUNIT_BOOTSTRAP'])) {
-            $globals = '$GLOBALS[\'__PHPUNIT_BOOTSTRAP\'] = ' . \var_export($GLOBALS['__PHPUNIT_BOOTSTRAP'], true) . ";\n";
+            $globals = '$GLOBALS[\'__PHPUNIT_BOOTSTRAP\'] = ' . \var_export(
+                $GLOBALS['__PHPUNIT_BOOTSTRAP'],
+                    true
+            ) . ";\n";
         }
 
         $template->setVar(

src/Util/Log/JUnit.php

@@ -15,7 +15,6 @@
 use PHPUnit\Framework\ExceptionWrapper;
 use PHPUnit\Framework\SelfDescribing;
 use PHPUnit\Framework\Test;
-use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\TestFailure;
 use PHPUnit\Framework\TestListener;
 use PHPUnit\Framework\TestSuite;
@@ -291,10 +290,6 @@ public function endTestSuite(TestSuite $suite): void
      */
     public function startTest(Test $test): void
     {
-        if (!$test instanceof TestCase) {
-            return;
-        }
-
         $testCase = $this->document->createElement('testcase');
         $testCase->setAttribute('name', $test->getName());
 
@@ -318,10 +313,6 @@ public function startTest(Test $test): void
      */
     public function endTest(Test $test, float $time): void
     {
-        if (!$test instanceof TestCase) {
-            return;
-        }
-
         $numAssertions = $test->getNumAssertions();
         $this->testSuiteAssertions[$this->testSuiteLevel] += $numAssertions;
 

tests/end-to-end/log-junit-phpt.phpt

@@ -0,0 +1,28 @@
+--TEST--
+phpunit --log-junit php://stdout ../end-to-end/phpt-stderr.phpt
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--log-junit';
+$_SERVER['argv'][3] = 'php://stdout';
+$_SERVER['argv'][4] = \realpath(__DIR__ . '/../end-to-end/phpt-stderr.phpt');
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit\TextUI\Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+.                                                                   1 / 1 (100%)<?xml version="1.0" encoding="UTF-8"?>
+<testsuites>
+  <testsuite name="" tests="1" assertions="1" errors="0" failures="0" skipped="0" time="%s">
+    <testcase name="%send-to-end%ephpt-stderr.phpt" assertions="1" time="%s">
+      <system-out>PHPUnit must look at STDERR when running PHPT tests.</system-out>
+    </testcase>
+  </testsuite>
+</testsuites>
+
+
+Time: %s, Memory: %s
+
+OK (1 test, 1 assertion)

tests/end-to-end/log-teamcity-phpt.phpt

@@ -0,0 +1,25 @@
+--TEST--
+phpunit --log-teamcity php://stdout ../end-to-end/phpt-stderr.phpt
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--log-teamcity';
+$_SERVER['argv'][3] = 'php://stdout';
+$_SERVER['argv'][4] = \realpath(__DIR__ . '/../end-to-end/phpt-stderr.phpt');
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit\TextUI\Command::main();
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+
+##teamcity[testCount count='1' flowId='%d']
+
+##teamcity[testStarted name='%send-to-end%ephpt-stderr.phpt' flowId='%d']
+.                                                                   1 / 1 (100%)
+##teamcity[testFinished name='%send-to-end%ephpt-stderr.phpt' duration='%d' flowId='%d']
+
+
+Time: %s, Memory: %s
+
+OK (1 test, 1 assertion)

tests/unit/Runner/PhptTestCaseTest.php

@@ -84,6 +84,16 @@ protected function tearDown(): void
         $this->testCase   = null;
     }
 
+    public function testAlwaysReportsNumberOfAssertionsIsOne(): void
+    {
+        $this->assertSame(1, $this->testCase->getNumAssertions());
+    }
+
+    public function testAlwaysReportsItDoesNotUseADataprovider(): void
+    {
+        $this->assertSame(false, $this->testCase->usesDataProvider());
+    }
+
     public function testShouldRunFileSectionAsTest(): void
     {
         $this->setPhpContent($this->ensureCorrectEndOfLine(self::EXPECT_CONTENT));