Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix class name detection when extending from another test suite. #271

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .topdeps
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.5
13 changes: 13 additions & 0 deletions .topmsg
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
From: Gunnar Wrobel <p@rdus.de>
Subject: [PATCH] t/PHPUnit/GW/Fix_test_suite_class_name_detection

Fixing a class name detection problem similar to
https://github.com/sebastianbergmann/phpunit/issues/71

When running "phpunit AllTests.php" on a Horde test suite file PHPUnit
identifies the class we extend from as our test suite class.

The patch uses reflection to ensure the detected class is actually
defined in the file that has been loaded.

Signed-off-by: Gunnar Wrobel <p@rdus.de>
6 changes: 4 additions & 2 deletions PHPUnit/Runner/StandardTestSuiteLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,17 @@ public function load($suiteClassName, $suiteClassFile = '', $syntaxCheck = FALSE

if (!class_exists($suiteClassName, FALSE)) {
PHPUnit_Util_Class::collectStart();
PHPUnit_Util_Fileloader::checkAndLoad($suiteClassFile, $syntaxCheck);
$filename = PHPUnit_Util_Fileloader::checkAndLoad($suiteClassFile, $syntaxCheck);
$loadedClasses = PHPUnit_Util_Class::collectEnd();
}

if (!class_exists($suiteClassName, FALSE) && !empty($loadedClasses)) {
$offset = 0 - strlen($suiteClassName);

foreach ($loadedClasses as $loadedClass) {
if (substr($loadedClass, $offset) === $suiteClassName) {
$class = new ReflectionClass($loadedClass);
if (substr($loadedClass, $offset) === $suiteClassName &&
$class->getFileName() == $filename) {
$suiteClassName = $loadedClass;
break;
}
Expand Down