Merge branch '5.7' into 6.4

ChangeLog-5.7.md

@@ -2,6 +2,12 @@
 
 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.25] - 2017-11-14
+
+### Fixed
+
+* Fixed [#2859](https://github.com/sebastianbergmann/phpunit/issues/2859): Regression caused by fix for [#2833](https://github.com/sebastianbergmann/phpunit/issues/2833)
+
 ## [5.7.24] - 2017-11-14
 
 ### Fixed
@@ -189,6 +195,7 @@ All notable changes of the PHPUnit 5.7 release series are documented in this fil
 * The `--tap` and `--log-tap` commandline options have been deprecated
 * The `--self-update` and `--self-upgrade` commandline options have been deprecated (PHAR binary only)
 
+[5.7.25]: https://github.com/sebastianbergmann/phpunit/compare/5.7.24...5.7.25
 [5.7.24]: https://github.com/sebastianbergmann/phpunit/compare/5.7.23...5.7.24
 [5.7.23]: https://github.com/sebastianbergmann/phpunit/compare/5.7.22...5.7.23
 [5.7.22]: https://github.com/sebastianbergmann/phpunit/compare/5.7.21...5.7.22

ChangeLog-6.4.md

@@ -2,12 +2,6 @@
 
 All notable changes of the PHPUnit 6.4 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
-## [6.4.5] - 2017-MM-DD
-
-### Fixed
-
-* Fixed [#2833](https://github.com/sebastianbergmann/phpunit/issues/2833): Test class loaded during data provider execution is not discovered
-
 ## [6.4.4] - 2017-11-08
 
 ### Fixed
@@ -57,7 +51,6 @@ All notable changes of the PHPUnit 6.4 release series are documented in this fil
 
 * Fixed [#2750](https://github.com/sebastianbergmann/phpunit/issues/2750): Useless call to `array_map()`
 
-[6.4.5]: https://github.com/sebastianbergmann/phpunit/compare/6.4.4...6.4.5
 [6.4.4]: https://github.com/sebastianbergmann/phpunit/compare/6.4.3...6.4.4
 [6.4.3]: https://github.com/sebastianbergmann/phpunit/compare/6.4.2...6.4.3
 [6.4.2]: https://github.com/sebastianbergmann/phpunit/compare/6.4.1...6.4.2

src/Framework/TestSuite.php

@@ -99,11 +99,6 @@ class TestSuite implements Test, SelfDescribing, IteratorAggregate
      */
     private $iteratorFilter;
 
-    /**
-     * @var array
-     */
-    private $declaredClasses;
-
     /**
      * Constructs a new TestSuite:
      *
@@ -128,8 +123,6 @@ class TestSuite implements Test, SelfDescribing, IteratorAggregate
      */
     public function __construct($theClass = '', $name = '')
     {
-        $this->declaredClasses = \get_declared_classes();
-
         $argumentsValid = false;
 
         if (\is_object($theClass) &&
@@ -324,7 +317,7 @@ public function addTestFile($filename)
         // test class itself. Figure out the actual test class.
         $classes    = \get_declared_classes();
         $filename   = Fileloader::checkAndLoad($filename);
-        $newClasses = \array_diff(\get_declared_classes(), $this->declaredClasses);
+        $newClasses = \array_diff(\get_declared_classes(), $classes);
 
         // 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,
@@ -334,8 +327,7 @@ public function addTestFile($filename)
             // On the assumption that test classes are defined first in files,
             // 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();
+            $this->foundClasses = \array_merge($newClasses, $this->foundClasses);
         }
 
         // The test class's name must match the filename, either in full, or as