Merge pull request #47 from Codeception/phpunit-7.4

Support PhpUnit 7.4

Author: Naktibalda

composer.json

@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "phpunit/phpunit": "~7.1.0|~7.2.0|~7.3.0",
+        "phpunit/phpunit": ">=7.1 <7.5",
         "phpunit/php-code-coverage": "^6.0",
         "sebastian/comparator": "^3.0",
         "sebastian/diff": "^3.0"

src/Log/JUnit.php

@@ -4,6 +4,7 @@
 use Codeception\Configuration;
 use Codeception\Test\Interfaces\Reported;
 use Codeception\Test\Test;
+use PHPUnit\Framework\TestCase;
 
 class JUnit extends \PHPUnit\Util\Log\JUnit
 {
@@ -39,6 +40,24 @@ public function endTest(\PHPUnit\Framework\Test $test, float $time):void
                 $numAssertions
             );
         }
-        parent::endTest($test, $time);
+
+        if ($test instanceof TestCase) {
+            parent::endTest($test, $time);
+            return;
+        }
+
+        // since PhpUnit 7.4.0, parent::endTest ignores tests that aren't instances of TestCase
+        // so I copied this code from PhpUnit 7.3.5
+
+        $this->currentTestCase->setAttribute(
+            'time',
+            \sprintf('%F', $time)
+        );
+        $this->testSuites[$this->testSuiteLevel]->appendChild(
+            $this->currentTestCase
+        );
+        $this->testSuiteTests[$this->testSuiteLevel]++;
+        $this->testSuiteTimes[$this->testSuiteLevel] += $time;
+        $this->currentTestCase = null;
     }
 }