Merge branch '5.7' into 6.5

Author: sebastianbergmann

ChangeLog-5.7.md

@@ -2,12 +2,13 @@
 
 All notable changes of the PHPUnit 5.7 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
-## [5.7.26] - 2017-MM-DD
+## [5.7.26] - 2017-12-17
 
 ### Fixed
 
 * Fixed [#2472](https://github.com/sebastianbergmann/phpunit/issues/2472): `PHPUnit\Util\Getopt` uses deprecated `each()` function
 * Fixed [#2833](https://github.com/sebastianbergmann/phpunit/issues/2833): Test class loaded during data provider execution is not discovered
+* Fixed [#2922](https://github.com/sebastianbergmann/phpunit/issues/2922): Test class is not discovered when there is a test class with `@group` and provider throwing exception in it, tests are run with `--exclude-group` for that group, there is another class called later (after the class from above), and the name of that another class does not match its filename
 
 ## [5.7.25] - 2017-11-14
 

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.5] - 2017-MM-DD
+
+### Fixed
+
+* Fixed [#2922](https://github.com/sebastianbergmann/phpunit/issues/2922): Test class is not discovered when there is a test class with `@group` and provider throwing exception in it, tests are run with `--exclude-group` for that group, there is another class called later (after the class from above), and the name of that another class does not match its filename
+
 ## [6.5.4] - 2017-12-10
 
 ### Changed
@@ -36,6 +42,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.5]: https://github.com/sebastianbergmann/phpunit/compare/6.5.4...6.5.5
 [6.5.4]: https://github.com/sebastianbergmann/phpunit/compare/6.5.3...6.5.4
 [6.5.3]: https://github.com/sebastianbergmann/phpunit/compare/6.5.2...6.5.3
 [6.5.2]: https://github.com/sebastianbergmann/phpunit/compare/6.5.1...6.5.2

src/Framework/TestSuite.php

@@ -358,12 +358,12 @@ public function addTestFile($filename)
         }
 
         foreach ($newClasses as $className) {
-            if ($className === DataProviderTestSuite::class) {
+            $class = new ReflectionClass($className);
+
+            if (dirname($class->getFileName()) === __DIR__) {
                 continue;
             }
 
-            $class = new ReflectionClass($className);
-
             if (!$class->isAbstract()) {
                 if ($class->hasMethod(BaseTestRunner::SUITE_METHODNAME)) {
                     $method = $class->getMethod(
@@ -746,7 +746,7 @@ public function run(TestResult $result = null)
             }
 
             if ($test instanceof TestCase || $test instanceof self) {
-                $test->setbeStrictAboutChangesToGlobalState($this->beStrictAboutChangesToGlobalState);
+                $test->setBeStrictAboutChangesToGlobalState($this->beStrictAboutChangesToGlobalState);
                 $test->setBackupGlobals($this->backupGlobals);
                 $test->setBackupStaticAttributes($this->backupStaticAttributes);
                 $test->setRunTestInSeparateProcess($this->runTestInSeparateProcess);
@@ -949,7 +949,7 @@ protected static function incompleteTest($class, $methodName, $message)
     /**
      * @param bool $beStrictAboutChangesToGlobalState
      */
-    public function setbeStrictAboutChangesToGlobalState($beStrictAboutChangesToGlobalState)
+    public function setBeStrictAboutChangesToGlobalState($beStrictAboutChangesToGlobalState)
     {
         if (null === $this->beStrictAboutChangesToGlobalState && \is_bool($beStrictAboutChangesToGlobalState)) {
             $this->beStrictAboutChangesToGlobalState = $beStrictAboutChangesToGlobalState;

src/TextUI/TestRunner.php

@@ -205,7 +205,7 @@ public function doRun(Test $suite, array $arguments = [], $exit = true)
         }
 
         if ($arguments['beStrictAboutChangesToGlobalState'] === true) {
-            $suite->setbeStrictAboutChangesToGlobalState(true);
+            $suite->setBeStrictAboutChangesToGlobalState(true);
         }
 
         if (\is_int($arguments['repeat']) && $arguments['repeat'] > 0) {

tests/TextUI/dataprovider-issue-2922.phpt

@@ -0,0 +1,18 @@
+--TEST--
+phpunit --exclude-group=foo ../_files/DataProviderIssue2922
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--exclude-group=foo';
+$_SERVER['argv'][3] = __DIR__ . '/../_files/DataProviderIssue2922';
+
+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/_files/DataProviderIssue2922/FirstTest.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Foo\DataProviderIssue2922;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @group foo
+ */
+class FirstTest extends TestCase
+{
+    /**
+     * @dataProvider provide
+     */
+    public function testFirst($x)
+    {
+        $this->assertTrue(true);
+    }
+
+    public function provide()
+    {
+        throw new \Exception();
+    }
+}

tests/_files/DataProviderIssue2922/SecondTest.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Foo\DataProviderIssue2922;
+
+use PHPUnit\Framework\TestCase;
+
+// the name of the class cannot match file name - if they match all is fine
+class SecondHelloWorldTest extends TestCase
+{
+    public function testSecond()
+    {
+        $this->assertTrue(true);
+    }
+}