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

PHPUnit shouldn't crash when a test suite contains both *.phpt files and unconventionally named tests #2973

Closed
wants to merge 3 commits 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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Framework/TestSuite.php
Expand Up @@ -305,7 +305,7 @@ public function addTestSuite($testClass): void
}
}

if (!$suiteMethod && !$testClass->isAbstract()) {
if (!$suiteMethod && !$testClass->isAbstract() && $testClass->isSubclassOf(TestCase::class)) {
$this->addTest(new self($testClass));
}
} else {
Expand Down
18 changes: 18 additions & 0 deletions tests/Regression/GitHub/2972.phpt
@@ -0,0 +1,18 @@
--TEST--
GH-2972: Test suite shouldn't fail when it contains both *.phpt files and unconventionally named tests
--FILE--
<?php
$_SERVER['argv'][1] = '--no-configuration';
$_SERVER['argv'][2] = __DIR__ . '/2972/';

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)
10 changes: 10 additions & 0 deletions tests/Regression/GitHub/2972/issue-2972-test.phpt
@@ -0,0 +1,10 @@
--TEST--
Just a sample test for issue 2972, does not actually test anything
--FILE--
<?php
echo "Hello world\n";
?>
===DONE===
--EXPECT--
Hello world
===DONE===
13 changes: 13 additions & 0 deletions tests/Regression/GitHub/2972/unconventiallyNamedIssue2972Test.php
@@ -0,0 +1,13 @@
<?php

namespace Issue2972;

use PHPUnit\Framework\TestCase;

class Issue2972Test extends TestCase
{
public function testHello()
{
$this->assertNotEmpty('Hello world!');
}
}