Merge branch 'w13_MDL-44510_m27_phpunit4' of https://github.com/skoda…

…k/moodle
moodle · Mar 26, 2014 · e1190da · e1190da
2 parents e80981b + 08ec831
commit e1190da
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/phpunit/classes/autoloader.php b/lib/phpunit/classes/autoloader.php
@@ -164,10 +164,10 @@ protected function guess_class_from_path($file) {
         // 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();