MDL-44510 fix class guessing in phpunit 4

2014-03-26 11:32:33 +08:00
parent 9e00d46b9c
commit 08ec831ff8
1 changed files with 2 additions and 2 deletions
@@ -164,10 +164,10 @@ class phpunit_autoloader implements PHPUnit_Runner_TestSuiteLoader {
        // Somebody is using just the file name, we need to look inside the file and guess the testcase
        // class name. Let's throw fatal error if there are more testcases in one file.

-        PHPUnit_Util_Class::collectStart();
+        $classes = get_declared_classes();
        PHPUnit_Util_Fileloader::checkAndLoad($file);
        $includePathFilename = stream_resolve_include_path($file);
-        $loadedClasses = PHPUnit_Util_Class::collectEnd();
+        $loadedClasses = array_diff(get_declared_classes(), $classes);

        $candidates = array();