feat: don't force using Factories trait when PHPUnit extension is enabled

Author: nikophil

.github/workflows/phpunit.yml

@@ -202,7 +202,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.1, 8.2, 8.3, 8.4 ]
+        php: [ 8.2, 8.3, 8.4 ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

src/Configuration.php

@@ -119,7 +119,9 @@ public static function instance(): self
             throw new FoundryNotBooted();
         }
 
-        FactoriesTraitNotUsed::throwIfComingFromKernelTestCaseWithoutFactoriesTrait();
+        if (!FoundryExtension::isEnabled()) {
+            FactoriesTraitNotUsed::throwIfComingFromKernelTestCaseWithoutFactoriesTrait();
+        }
 
         return \is_callable(self::$instance) ? (self::$instance)() : self::$instance;
     }

src/Test/Factories.php

@@ -32,15 +32,15 @@ trait Factories
     #[Before(5)]
     public function _beforeHook(): void
     {
-        $this->_loadDataProvidedProxies(); // todo remove
-
-        if (FoundryExtension::isEnabled()) {
-            trigger_deprecation('zenstruck/foundry', '2.7', sprintf('Trait %s is deprecated and will be removed in Foundry 3.', Factories::class));
+        if (!FoundryExtension::isEnabled()) {
+            $this->_bootFoundry();
 
             return;
         }
 
-        $this->_bootFoundry();
+        trigger_deprecation('zenstruck/foundry', '2.7', sprintf('Trait %s is deprecated and will be removed in Foundry 3.', Factories::class));
+
+        $this->_loadDataProvidedProxies(); // todo remove
     }
 
     /**

tests/Integration/ForceFactoriesTraitUsage/AnotherBaseTestCase.php

@@ -18,6 +18,8 @@
 
 abstract class AnotherBaseTestCase extends KernelTestCase
 {
+    use SkipWithPHPUnitExtension;
+
     // @phpstan-ignore missingType.generics
     public function useProxyClass(Proxy $proxy): void
     {

tests/Integration/ForceFactoriesTraitUsage/KernelTestCaseWithBothTraitsInWrongOrderTest.php

@@ -23,7 +23,7 @@
 #[RequiresPhpunit('>=11.0')]
 final class KernelTestCaseWithBothTraitsInWrongOrderTest extends KernelTestCase
 {
-    use Factories, ResetDatabase;
+    use Factories, ResetDatabase, SkipWithPHPUnitExtension;
 
     #[Test]
     public function should_not_throw(): void

tests/Integration/ForceFactoriesTraitUsage/KernelTestCaseWithBothTraitsTest.php

@@ -23,7 +23,7 @@
 #[RequiresPhpunit('>=11.0')]
 final class KernelTestCaseWithBothTraitsTest extends KernelTestCase
 {
-    use Factories, ResetDatabase;
+    use Factories, ResetDatabase, SkipWithPHPUnitExtension;
 
     #[Test]
     public function should_not_throw(): void

tests/Integration/ForceFactoriesTraitUsage/KernelTestCaseWithFactoriesTraitTest.php

@@ -22,7 +22,7 @@
 #[RequiresPhpunit('>=11.0')]
 final class KernelTestCaseWithFactoriesTraitTest extends KernelTestCase
 {
-    use Factories;
+    use Factories, SkipWithPHPUnitExtension;
 
     #[Test]
     public function should_not_throw(): void

tests/Integration/ForceFactoriesTraitUsage/KernelTestCaseWithOnlyResetDatabaseTraitTestWithoutFactoriesTest.php

@@ -22,4 +22,5 @@ final class KernelTestCaseWithOnlyResetDatabaseTraitTestWithoutFactoriesTest ext
 {
     use KernelTestCaseWithoutFactoriesTrait;
     use ResetDatabase;
+    use SkipWithPHPUnitExtension;
 }

tests/Integration/ForceFactoriesTraitUsage/KernelTestWithoutFactoriesTest.php

@@ -19,5 +19,5 @@
 #[RequiresPhpunit('>=11.0')]
 final class KernelTestWithoutFactoriesTest extends KernelTestCase
 {
-    use KernelTestCaseWithoutFactoriesTrait;
+    use KernelTestCaseWithoutFactoriesTrait, SkipWithPHPUnitExtension;
 }

tests/Integration/ForceFactoriesTraitUsage/SkipWithPHPUnitExtension.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Zenstruck\Foundry\Tests\Integration\ForceFactoriesTraitUsage;
+
+use PHPUnit\Framework\Attributes\Before;
+use PHPUnit\Framework\TestCase;
+use Zenstruck\Foundry\PHPUnit\FoundryExtension;
+
+/**
+ * @phpstan-require-extends TestCase
+ */
+trait SkipWithPHPUnitExtension
+{
+    #[Before]
+    public function _skipWithPHPUnitExtension(): void
+    {
+        if (FoundryExtension::isEnabled()) {
+            self::markTestSkipped('This test requires *NOT* using Foundry\'s PHUnit extension.');
+        }
+    }
+}