Merge branch '6.5' into 7.1

Author: sebastianbergmann

ChangeLog-6.5.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 6.5 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [6.5.8] - 2018-MM-DD
+
+### Fixed
+
+* Fixed [#2830](https://github.com/sebastianbergmann/phpunit/issues/2830): `@runClassInSeparateProcess` does not work for tests that use `@dataProvider`
+
 ## [6.5.7] - 2018-02-26
 
 ### Fixed
@@ -56,6 +62,7 @@ All notable changes of the PHPUnit 6.5 release series are documented in this fil
 * Fixed [#2654](https://github.com/sebastianbergmann/phpunit/issues/2654): Problems with `assertJsonStringEqualsJsonString()`
 * Fixed [#2810](https://github.com/sebastianbergmann/phpunit/pull/2810): Code Coverage for PHPT tests does not work
 
+[6.5.8]: https://github.com/sebastianbergmann/phpunit/compare/6.5.7...6.5.8
 [6.5.7]: https://github.com/sebastianbergmann/phpunit/compare/6.5.6...6.5.7
 [6.5.6]: https://github.com/sebastianbergmann/phpunit/compare/6.5.5...6.5.6
 [6.5.5]: https://github.com/sebastianbergmann/phpunit/compare/6.5.4...6.5.5

ChangeLog-7.1.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 7.1 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [7.1.2] - 2018-MM-DD
+
+### Fixed
+
+* Fixed [#2830](https://github.com/sebastianbergmann/phpunit/issues/2830): `@runClassInSeparateProcess` does not work for tests that use `@dataProvider`
+
 ## [7.1.1] - 2018-04-06
 
 ### Fixed
@@ -20,6 +26,7 @@ All notable changes of the PHPUnit 7.1 release series are documented in this fil
 * `PHPUnit\Framework\Assert` is no longer searched for test methods
 * `ReflectionMethod::invokeArgs()` is no longer used to invoke test methods
 
+[7.1.2]: https://github.com/sebastianbergmann/phpunit/compare/7.1.1...7.1.2
 [7.1.1]: https://github.com/sebastianbergmann/phpunit/compare/7.1.0...7.1.1
 [7.1.0]: https://github.com/sebastianbergmann/phpunit/compare/7.0...7.1.0
 

src/Framework/TestCase.php

@@ -780,7 +780,8 @@ public function run(TestResult $result = null): TestResult
                 'isStrictAboutTodoAnnotatedTests'            => $isStrictAboutTodoAnnotatedTests,
                 'isStrictAboutResourceUsageDuringSmallTests' => $isStrictAboutResourceUsageDuringSmallTests,
                 'codeCoverageFilter'                         => $codeCoverageFilter,
-                'configurationFilePath'                      => $configurationFilePath
+                'configurationFilePath'                      => $configurationFilePath,
+                'name'                                       => $this->getName(false),
             ];
 
             if (!$runEntireClass) {

src/Util/PHP/Template/TestCaseClass.tpl.dist

@@ -47,7 +47,7 @@ function __phpunit_run_isolated_test()
     $result->beStrictAboutTodoAnnotatedTests({isStrictAboutTodoAnnotatedTests});
     $result->beStrictAboutResourceUsageDuringSmallTests({isStrictAboutResourceUsageDuringSmallTests});
 
-    $test = new {className}(null, unserialize('{data}'), '{dataName}');
+    $test = new {className}('{name}', unserialize('{data}'), '{dataName}');
     $test->setDependencyInput(unserialize('{dependencyInput}'));
     $test->setInIsolation(TRUE);
 

tests/Regression/GitHub/2830.phpt

@@ -0,0 +1,20 @@
+--TEST--
+GH-2830: @runClassInSeparateProcess fails for tests with a @dataProvider
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue2830';
+$_SERVER['argv'][3] = __DIR__ . '/2830/Issue2830Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+
+PHPUnit\TextUI\Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+.                                                                   1 / 1 (100%)
+
+Time: %s, Memory: %s
+
+OK (1 test, 1 assertion)

tests/Regression/GitHub/2830/Issue2830Test.php

@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @runClassInSeparateProcess
+ */
+class Issue2830Test extends PHPUnit\Framework\TestCase
+{
+    /**
+     * @dataProvider simpleDataProvider
+     */
+    public function testMethodUsesDataProvider()
+    {
+        $this->assertTrue(true);
+    }
+
+    public function simpleDataProvider()
+    {
+        return [
+            ['foo'],
+        ];
+    }
+}