Merge branch '7.x' into 8.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Oct 28, 2023 · 023709d · 023709d
2 parents c3a4ba0 + d93a3aa
commit 023709d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Concerns/ApplicationTestingHooks.php b/src/Concerns/ApplicationTestingHooks.php
@@ -12,7 +12,7 @@
 use Illuminate\Support\Facades\ParallelTesting;
 use Illuminate\View\Component;
 use Mockery;
-use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\TestCase as PHPUnitTestCase;
 use Throwable;
 
 trait ApplicationTestingHooks
@@ -104,7 +104,7 @@ final protected function tearDownTheApplicationTestingHooks(?Closure $callback =
             \call_user_func($callback);
         }
 
-        if (class_exists(Mockery::class)) {
+        if (class_exists(Mockery::class) && $this instanceof PHPUnitTestCase) {
             if ($container = Mockery::getContainer()) {
                 $this->addToAssertionCount($container->mockery_getExpectationCount());
             }
@@ -138,7 +138,7 @@ final protected function tearDownTheApplicationTestingHooks(?Closure $callback =
      */
     protected function setUpParallelTestingCallbacks(): void
     {
-        if (class_exists(ParallelTesting::class) && $this instanceof TestCase) {
+        if (class_exists(ParallelTesting::class) && $this instanceof PHPUnitTestCase) {
             /** @phpstan-ignore-next-line */
             ParallelTesting::callSetUpTestCaseCallbacks($this);
         }
@@ -149,7 +149,7 @@ protected function setUpParallelTestingCallbacks(): void
      */
     protected function tearDownParallelTestingCallbacks(): void
     {
-        if (class_exists(ParallelTesting::class) && $this instanceof TestCase) {
+        if (class_exists(ParallelTesting::class) && $this instanceof PHPUnitTestCase) {
             /** @phpstan-ignore-next-line */
             ParallelTesting::callTearDownTestCaseCallbacks($this);
         }