From be455102411fa273bb5090e687d80ddd6e4226c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Wer=C5=82os?= <werlos@gmail.com>
Date: Sat, 16 Dec 2017 19:18:33 +0100
Subject: [PATCH 1/2] Test case for #2922

---
 tests/TextUI/dataprovider-issue-2922.phpt     | 18 ++++++++++++++
 .../DataProviderIssue2922/FirstTest.php       | 24 +++++++++++++++++++
 .../DataProviderIssue2922/SecondTest.php      | 14 +++++++++++
 3 files changed, 56 insertions(+)
 create mode 100644 tests/TextUI/dataprovider-issue-2922.phpt
 create mode 100644 tests/_files/DataProviderIssue2922/FirstTest.php
 create mode 100644 tests/_files/DataProviderIssue2922/SecondTest.php

diff --git a/tests/TextUI/dataprovider-issue-2922.phpt b/tests/TextUI/dataprovider-issue-2922.phpt
new file mode 100644
index 00000000000..3de85a9a510
--- /dev/null
+++ b/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)
diff --git a/tests/_files/DataProviderIssue2922/FirstTest.php b/tests/_files/DataProviderIssue2922/FirstTest.php
new file mode 100644
index 00000000000..cbcb84b1889
--- /dev/null
+++ b/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 \FooException();
+    }
+}
diff --git a/tests/_files/DataProviderIssue2922/SecondTest.php b/tests/_files/DataProviderIssue2922/SecondTest.php
new file mode 100644
index 00000000000..570ae560908
--- /dev/null
+++ b/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);
+    }
+}

From c906d78e1a5bdd45572843273e709e2ed3fe537f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Wer=C5=82os?= <werlos@gmail.com>
Date: Sat, 16 Dec 2017 19:32:51 +0100
Subject: [PATCH 2/2] Fix for #2922

---
 src/Framework/TestSuite.php                      | 2 +-
 tests/_files/DataProviderIssue2922/FirstTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
index 40694d06214..0f979175707 100644
--- a/src/Framework/TestSuite.php
+++ b/src/Framework/TestSuite.php
@@ -348,7 +348,7 @@ public function addTestFile($filename)
         }
 
         foreach ($newClasses as $className) {
-            if ($className === 'PHPUnit_Framework_TestSuite_DataProvider') {
+            if (strpos($className, 'PHPUnit_Framework') === 0) {
                 continue;
             }
 
diff --git a/tests/_files/DataProviderIssue2922/FirstTest.php b/tests/_files/DataProviderIssue2922/FirstTest.php
index cbcb84b1889..8b3302ca1ca 100644
--- a/tests/_files/DataProviderIssue2922/FirstTest.php
+++ b/tests/_files/DataProviderIssue2922/FirstTest.php
@@ -19,6 +19,6 @@ public function testFirst($x)
 
     public function provide()
     {
-        throw new \FooException();
+        throw new \Exception();
     }
 }