Fix for declaring test case in data provider

src/Framework/TestSuite.php

@@ -87,6 +87,11 @@ class PHPUnit_Framework_TestSuite implements PHPUnit_Framework_Test, PHPUnit_Fra
      */
     private $iteratorFilter = null;
 
+    /**
+     * @var array
+     */
+    private $declaredClasses;
+
     /**
      * Constructs a new TestSuite:
      *
@@ -111,6 +116,8 @@ class PHPUnit_Framework_TestSuite implements PHPUnit_Framework_Test, PHPUnit_Fra
      */
     public function __construct($theClass = '', $name = '')
     {
+        $this->declaredClasses = get_declared_classes();
+
         $argumentsValid = false;
 
         if (is_object($theClass) &&
@@ -306,9 +313,8 @@ public function addTestFile($filename)
 
         // The given file may contain further stub classes in addition to the
         // test class itself. Figure out the actual test class.
-        $classes    = get_declared_classes();
         $filename   = PHPUnit_Util_Fileloader::checkAndLoad($filename);
-        $newClasses = array_diff(get_declared_classes(), $classes);
+        $newClasses = array_diff(get_declared_classes(), $this->declaredClasses);
 
         // The diff is empty in case a parent class (with test methods) is added
         // AFTER a child class that inherited from it. To account for that case,
@@ -319,6 +325,7 @@ public function addTestFile($filename)
             // process discovered classes in approximate LIFO order, so as to
             // avoid unnecessary reflection.
             $this->foundClasses = array_merge($newClasses, $this->foundClasses);
+            $this->declaredClasses = get_declared_classes();
         }
 
         // The test class's name must match the filename, either in full, or as
@@ -341,6 +348,10 @@ public function addTestFile($filename)
         }
 
         foreach ($newClasses as $className) {
+            if ($className === 'PHPUnit_Framework_TestSuite_DataProvider') {
+                continue;
+            }
+
             $class = new ReflectionClass($className);
 
             if (!$class->isAbstract()) {

tests/TextUI/dataprovider-issue-2833.phpt

@@ -0,0 +1,17 @@
+--TEST--
+phpunit ../_files/DataProviderIssue2833
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = __DIR__ . '/../_files/DataProviderIssue2833';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+..                                                                  2 / 2 (100%)
+
+Time: %s, Memory: %s
+
+OK (2 tests, 2 assertions)

tests/TextUI/dataprovider-issue-2859.phpt

@@ -0,0 +1,17 @@
+--TEST--
+phpunit -c ../_files/DataProviderIssue2859/phpunit.xml
+--FILE--
+<?php
+$_SERVER['argv'][1] = '-c';
+$_SERVER['argv'][2] = __DIR__ . '/../_files/DataProviderIssue2859/phpunit.xml';
+
+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/DataProviderIssue2833/FirstTest.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Foo\DataProviderIssue2833;
+
+use PHPUnit\Framework\TestCase;
+
+class FirstTest extends TestCase
+{
+    /**
+     * @dataProvider provide
+     */
+    public function testFirst($x)
+    {
+        $this->assertTrue(true);
+    }
+
+    public function provide()
+    {
+        SecondTest::DUMMY;
+
+        return [[true]];
+    }
+}

tests/_files/DataProviderIssue2833/SecondTest.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Foo\DataProviderIssue2833;
+
+use PHPUnit\Framework\TestCase;
+
+class SecondTest extends TestCase
+{
+    const DUMMY = 'dummy';
+
+    public function testSecond()
+    {
+        $this->assertTrue(true);
+    }
+}

tests/_files/DataProviderIssue2859/phpunit.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit>
+    <testsuites>
+        <testsuite name="Test Suite">
+            <directory>./tests/</directory>
+            <directory>./tests/*/</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

tests/_files/DataProviderIssue2859/tests/another/TestWithDataProviderTest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Foo\DataProviderIssue2859;
+
+use PHPUnit\Framework\TestCase;
+
+class TestWithDataProviderTest extends TestCase
+{
+    /**
+     * @dataProvider provide
+     */
+    public function testFirst($x)
+    {
+        $this->assertTrue(true);
+    }
+
+    public function provide()
+    {
+        return [[true]];
+    }
+}