Merge branch '11.2'

sebastianbergmann · Jun 16, 2024 · 713cf8a · 713cf8a
2 parents 992911f + c211886
commit 713cf8a
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 4 deletions.
diff --git a/src/Framework/MockObject/Runtime/Api/MutableStubApi.php b/src/Framework/MockObject/Runtime/Api/MutableStubApi.php
@@ -26,12 +26,12 @@ public function __phpunit_state(): TestDoubleState
     /** @noinspection MagicMethodsValidityInspection */
     public function __phpunit_getInvocationHandler(): InvocationHandler
     {
-        return $this->__phpunit_state->invocationHandler();
+        return $this->__phpunit_state()->invocationHandler();
     }
 
     /** @noinspection MagicMethodsValidityInspection */
     public function __phpunit_unsetInvocationMocker(): void
     {
-        $this->__phpunit_state->unsetInvocationHandler();
+        $this->__phpunit_state()->unsetInvocationHandler();
     }
 }
diff --git a/src/Framework/MockObject/Runtime/Api/StubApi.php b/src/Framework/MockObject/Runtime/Api/StubApi.php
@@ -24,12 +24,12 @@ public function __phpunit_state(): TestDoubleState
     /** @noinspection MagicMethodsValidityInspection */
     public function __phpunit_getInvocationHandler(): InvocationHandler
     {
-        return $this->__phpunit_state->invocationHandler();
+        return $this->__phpunit_state()->invocationHandler();
     }
 
     /** @noinspection MagicMethodsValidityInspection */
     public function __phpunit_unsetInvocationMocker(): void
     {
-        $this->__phpunit_state->unsetInvocationHandler();
+        $this->__phpunit_state()->unsetInvocationHandler();
     }
 }
diff --git a/tests/_files/NoTestCase.php b/tests/_files/NoTestCase.php
@@ -0,0 +1,14 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture;
+
+final class NoTestCase
+{
+}
diff --git a/tests/unit/Framework/TestSuiteTest.php b/tests/unit/Framework/TestSuiteTest.php
@@ -11,10 +11,12 @@
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Small;
+use PHPUnit\TestFixture\AbstractTestCase;
 use PHPUnit\TestFixture\DependencyFailureTest;
 use PHPUnit\TestFixture\DependencyOnClassTest;
 use PHPUnit\TestFixture\DependencySuccessTest;
 use PHPUnit\TestFixture\MultiDependencyTest;
+use PHPUnit\TestFixture\NoTestCase;
 use PHPUnit\TestFixture\NotPublicTestCase;
 use ReflectionClass;
 
@@ -113,4 +115,22 @@ public function testResolverOnlyUsesSuitesAndCases(): void
             DependencyFailureTest::class . '::class',
         ], $suite->requires(), 'Required test names incorrect');
     }
+
+    public function testRejectsAbstractTestClass(): void
+    {
+        $suite = TestSuite::empty('the-test-suite');
+
+        $this->expectException(Exception::class);
+
+        $suite->addTestSuite(new ReflectionClass(AbstractTestCase::class));
+    }
+
+    public function testRejectsClassThatDoesNotExtendTestClass(): void
+    {
+        $suite = TestSuite::empty('the-test-suite');
+
+        $this->expectException(Exception::class);
+
+        $suite->addTestSuite(new ReflectionClass(NoTestCase::class));
+    }
 }