minor: remove Factories trait usage in test when possible

nikophil · nikophil · commit d295c651dbd3 · 2025-11-09T16:41:32.000+01:00
diff --git a/phpunit-deprecation-baseline.xml b/phpunit-deprecation-baseline.xml
@@ -13,8 +13,8 @@
 Foundry now leverages the native PHP lazy system to auto-refresh objects (it can be enabled with "zenstruck_foundry.enable_auto_refresh_with_lazy_objects" configuration).
 See https://github.com/zenstruck/foundry/blob/2.x/UPGRADE-2.7.md to upgrade.]]></issue>
 
-            <issue><![CDATA[Since zenstruck/foundry 2.8: Trait Zenstruck\Foundry\Test\Factories is deprecated and will be removed in Foundry 3. See https://github.com/zenstruck/foundry/blob/2.x/UPGRADE-2.8.md to upgrade.]]></issue>
-            <issue><![CDATA[Since zenstruck/foundry 2.8: Not using Foundry's PHPUnit extension is deprecated and will throw an error in Foundry 3. See https://github.com/zenstruck/foundry/blob/2.x/UPGRADE-2.8.md to upgrade.]]></issue>
+            <issue><![CDATA[Since zenstruck/foundry 2.9: Trait Zenstruck\Foundry\Test\Factories is deprecated and will be removed in Foundry 3. See https://github.com/zenstruck/foundry/blob/2.x/UPGRADE-2.9.md to upgrade.]]></issue>
+            <issue><![CDATA[Since zenstruck/foundry 2.9: Not using Foundry's PHPUnit extension is deprecated and will throw an error in Foundry 3. See https://github.com/zenstruck/foundry/blob/2.x/UPGRADE-2.9.md to upgrade.]]></issue>
 
             <issue><![CDATA[Since doctrine/mongodb-odm 2.14: Not using native lazy objects is deprecated and will be impossible in Doctrine MongoDB ODM 3.0.]]></issue>
         </line>
diff --git a/src/Configuration.php b/src/Configuration.php
@@ -22,7 +22,6 @@
 use Zenstruck\Foundry\Persistence\PersistedObjectsTracker;
 use Zenstruck\Foundry\Persistence\PersistenceManager;
 use Zenstruck\Foundry\PHPUnit\FoundryExtension;
-use Zenstruck\Foundry\Test\Factories;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
diff --git a/src/PHPUnit/BootFoundryOnPreparationStarted.php b/src/PHPUnit/BootFoundryOnPreparationStarted.php
@@ -33,7 +33,6 @@ public function notify(Event\Test\PreparationStarted $event): void
             return;
         }
         /** @var Event\Code\TestMethod $test */
-
         $this->bootFoundry($test->className());
     }
 
diff --git a/src/PHPUnit/DataProvider/TriggerDataProviderPersistenceOnTestPrepared.php b/src/PHPUnit/DataProvider/TriggerDataProviderPersistenceOnTestPrepared.php
@@ -30,7 +30,6 @@ public function notify(Event\Test\Prepared $event): void
             return;
         }
         /** @var Event\Code\TestMethod $test */
-
         if (!$test->testData()->hasDataFromDataProvider() || $test->metadata()->isDataProvider()->isEmpty()) {
             return;
         }
diff --git a/src/PHPUnit/FoundryExtension.php b/src/PHPUnit/FoundryExtension.php
@@ -25,8 +25,7 @@
  * @internal
  * @author Nicolas PHILIPPE <nikophil@gmail.com>
  */
-
-if (interface_exists(Runner\Extension\Extension::class)) {
+if (\interface_exists(Runner\Extension\Extension::class)) {
     final class FoundryExtension implements Runner\Extension\Extension
     {
         private static bool $enabled = false;
diff --git a/src/PHPUnit/KernelTestCaseHelper.php b/src/PHPUnit/KernelTestCaseHelper.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the zenstruck/foundry package.
+ *
+ * (c) Kevin Bond <kevinbond@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Zenstruck\Foundry\PHPUnit;
 
 use PHPUnit\Framework\TestCase;
diff --git a/src/Persistence/PersistentObjectFromDataProviderRegistry.php b/src/Persistence/PersistentObjectFromDataProviderRegistry.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the zenstruck/foundry package.
+ *
+ * (c) Kevin Bond <kevinbond@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Zenstruck\Foundry\Persistence;
 
 /**
@@ -56,8 +65,8 @@ public function addDataset(string $className, string $methodName, callable $data
 
         $dataProviderResult = $dataProviderResult();
 
-        if (!is_array($dataProviderResult)) {
-            $dataProviderResult = iterator_to_array($dataProviderResult);
+        if (!\is_array($dataProviderResult)) {
+            $dataProviderResult = \iterator_to_array($dataProviderResult);
         }
 
         $testCaseContext = $this->testCaseContext($className, $methodName);
@@ -79,7 +88,7 @@ public function deferObjectCreation(PersistentObjectFactory $factory): object
             return $this->objectsBuffer[] = ProxyGenerator::wrapFactory($factory);
         }
 
-        return array_shift($this->objectsBuffer); // @phpstan-ignore return.type
+        return \array_shift($this->objectsBuffer); // @phpstan-ignore return.type
     }
 
     public function triggerPersistenceForDataset(string $className, string $methodName, int|string $dataSetName): void
diff --git a/tests/Integration/Attribute/WithStory/ParentClassWithStoryAttributeTestCase.php b/tests/Integration/Attribute/WithStory/ParentClassWithStoryAttributeTestCase.php
@@ -15,7 +15,6 @@
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Zenstruck\Foundry\Attribute\WithStory;
-use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Test\ResetDatabase;
 use Zenstruck\Foundry\Tests\Fixture\Stories\EntityStory;
 use Zenstruck\Foundry\Tests\Integration\RequiresORM;
@@ -26,5 +25,5 @@
 #[WithStory(EntityStory::class)]
 abstract class ParentClassWithStoryAttributeTestCase extends KernelTestCase
 {
-    use Factories, RequiresORM, ResetDatabase;
+    use RequiresORM, ResetDatabase;
 }
diff --git a/tests/Integration/Attribute/WithStory/WithStoryOnClassTest.php b/tests/Integration/Attribute/WithStory/WithStoryOnClassTest.php
@@ -19,7 +19,6 @@
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Zenstruck\Foundry\Attribute\WithStory;
 use Zenstruck\Foundry\PHPUnit\FoundryExtension;
-use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Test\ResetDatabase;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\GenericEntityFactory;
 use Zenstruck\Foundry\Tests\Fixture\Stories\EntityPoolStory;
@@ -35,7 +34,7 @@
 #[WithStory(EntityStory::class)]
 final class WithStoryOnClassTest extends KernelTestCase
 {
-    use Factories, RequiresORM, ResetDatabase;
+    use RequiresORM, ResetDatabase;
 
     #[Test]
     public function can_use_story_in_attribute(): void
diff --git a/tests/Integration/Attribute/WithStory/WithStoryOnMethodTest.php b/tests/Integration/Attribute/WithStory/WithStoryOnMethodTest.php
@@ -19,7 +19,6 @@
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Zenstruck\Foundry\Attribute\WithStory;
 use Zenstruck\Foundry\PHPUnit\FoundryExtension;
-use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Test\ResetDatabase;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\GenericEntityFactory;
 use Zenstruck\Foundry\Tests\Fixture\Stories\EntityPoolStory;
@@ -35,7 +34,7 @@
 #[RequiresPhpunitExtension(FoundryExtension::class)]
 final class WithStoryOnMethodTest extends KernelTestCase
 {
-    use Factories, RequiresORM, ResetDatabase;
+    use RequiresORM, ResetDatabase;
 
     #[Test]
     #[WithStory(EntityStory::class)]
diff --git a/tests/Integration/DataProvider/DataProviderForServiceFactoryInKernelTestCaseTest.php b/tests/Integration/DataProvider/DataProviderForServiceFactoryInKernelTestCaseTest.php
@@ -20,7 +20,6 @@
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Zenstruck\Foundry\Configuration;
 use Zenstruck\Foundry\PHPUnit\FoundryExtension;
-use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Object1Factory;
 use Zenstruck\Foundry\Tests\Fixture\Object1;
 
@@ -34,8 +33,6 @@
 #[RequiresPhpunitExtension(FoundryExtension::class)]
 final class DataProviderForServiceFactoryInKernelTestCaseTest extends KernelTestCase
 {
-    use Factories;
-
     #[Test]
     #[DataProvider('createObjectFromServiceFactoryInDataProvider')]
     public function it_can_create_one_object_in_data_provider(?Object1 $providedData, string $expected): void
diff --git a/tests/Integration/DataProvider/DataProviderInUnitTest.php b/tests/Integration/DataProvider/DataProviderInUnitTest.php
@@ -21,7 +21,6 @@
 use PHPUnit\Framework\TestCase;
 use Zenstruck\Foundry\Persistence\ProxyGenerator;
 use Zenstruck\Foundry\PHPUnit\FoundryExtension;
-use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Tests\Fixture\Entity\GenericEntity;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\GenericEntityFactory;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\GenericProxyEntityFactory;
@@ -40,8 +39,6 @@
 #[RequiresPhpunitExtension(FoundryExtension::class)]
 final class DataProviderInUnitTest extends TestCase
 {
-    use Factories;
-
     #[Test]
     #[DataProvider('createObjectWithObjectFactoryInDataProvider')]
     public function assert_it_can_create_object_with_object_factory_in_data_provider(mixed $providedData, mixed $expectedData): void
diff --git a/tests/Integration/DataProvider/DataProviderWithInMemoryTest.php b/tests/Integration/DataProvider/DataProviderWithInMemoryTest.php
@@ -23,7 +23,6 @@
 use Zenstruck\Foundry\Persistence\PersistentObjectFactory;
 use Zenstruck\Foundry\Persistence\ProxyGenerator;
 use Zenstruck\Foundry\PHPUnit\FoundryExtension;
-use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Test\ResetDatabase;
 use Zenstruck\Foundry\Tests\Fixture\Entity\Contact;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\Contact\ContactFactory;
@@ -39,7 +38,6 @@
 #[RequiresPhpunitExtension(FoundryExtension::class)]
 final class DataProviderWithInMemoryTest extends KernelTestCase
 {
-    use Factories;
     use RequiresORM; // needed to use the entity manager
     use ResetDatabase;
 
diff --git a/tests/Integration/DataProvider/DataProviderWithPersistentFactoryAndPHP84InKernelTest.php b/tests/Integration/DataProvider/DataProviderWithPersistentFactoryAndPHP84InKernelTest.php
@@ -21,7 +21,6 @@
 use PHPUnit\Framework\Attributes\Test;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Zenstruck\Foundry\PHPUnit\FoundryExtension;
-use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Test\ResetDatabase;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\GenericEntityFactory;
 use Zenstruck\Foundry\Tests\Fixture\Model\GenericModel;
@@ -36,7 +35,6 @@
 #[RequiresEnvironmentVariable('USE_PHP_84_LAZY_OBJECTS', '1')]
 final class DataProviderWithPersistentFactoryAndPHP84InKernelTest extends KernelTestCase
 {
-    use Factories;
     use ResetDatabase;
 
     #[Test]
diff --git a/tests/Integration/DataProvider/DataProviderWithPersistentFactoryInKernelTestCase.php b/tests/Integration/DataProvider/DataProviderWithPersistentFactoryInKernelTestCase.php
@@ -14,7 +14,6 @@
 namespace Zenstruck\Foundry\Tests\Integration\DataProvider;
 
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\Attributes\RequiresPhpunit;
 use PHPUnit\Framework\Attributes\RequiresPhpunitExtension;
@@ -25,10 +24,10 @@
 use Zenstruck\Foundry\Persistence\Proxy;
 use Zenstruck\Foundry\Persistence\ProxyGenerator;
 use Zenstruck\Foundry\PHPUnit\FoundryExtension;
-use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Test\ResetDatabase;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Object1Factory;
 use Zenstruck\Foundry\Tests\Fixture\Model\GenericModel;
+
 use function Zenstruck\Foundry\Persistence\assert_persisted;
 
 /**
@@ -37,10 +36,8 @@
  */
 #[RequiresPhpunit('>=11.4')]
 #[RequiresPhpunitExtension(FoundryExtension::class)]
-#[IgnoreDeprecations]
 abstract class DataProviderWithPersistentFactoryInKernelTestCase extends KernelTestCase
 {
-    use Factories;
     use ResetDatabase;
 
     #[Test]
diff --git a/tests/Integration/ForceFactoriesTraitUsage/SkipWithPHPUnitExtension.php b/tests/Integration/ForceFactoriesTraitUsage/SkipWithPHPUnitExtension.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the zenstruck/foundry package.
+ *
+ * (c) Kevin Bond <kevinbond@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Zenstruck\Foundry\Tests\Integration\ForceFactoriesTraitUsage;
 
 use PHPUnit\Framework\Attributes\Before;
diff --git a/tests/Integration/InMemory/DoctrineInMemoryDecoratorTest.php b/tests/Integration/InMemory/DoctrineInMemoryDecoratorTest.php
@@ -20,7 +20,6 @@
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Zenstruck\Foundry\InMemory\AsInMemoryTest;
 use Zenstruck\Foundry\PHPUnit\FoundryExtension;
-use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Tests\Fixture\Entity\WithEmbeddableEntity;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\Category\CategoryFactory;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\Contact\ContactFactory;
@@ -41,8 +40,6 @@
 #[AsInMemoryTest]
 final class DoctrineInMemoryDecoratorTest extends KernelTestCase
 {
-    use Factories;
-
     /**
      * @test
      */
diff --git a/tests/Integration/InMemory/InMemoryAttributeOnMethodTest.php b/tests/Integration/InMemory/InMemoryAttributeOnMethodTest.php
@@ -20,7 +20,6 @@
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Zenstruck\Foundry\InMemory\AsInMemoryTest;
 use Zenstruck\Foundry\PHPUnit\FoundryExtension;
-use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Test\ResetDatabase;
 use Zenstruck\Foundry\Tests\Fixture\Entity\Address;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\Address\AddressFactory;
@@ -34,7 +33,6 @@
 #[RequiresPhpunitExtension(FoundryExtension::class)]
 final class InMemoryAttributeOnMethodTest extends KernelTestCase
 {
-    use Factories;
     use RequiresORM;
     use ResetDatabase;
 
diff --git a/tests/Integration/InMemory/InMemoryTest.php b/tests/Integration/InMemory/InMemoryTest.php
@@ -20,7 +20,6 @@
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Zenstruck\Foundry\InMemory\AsInMemoryTest;
 use Zenstruck\Foundry\PHPUnit\FoundryExtension;
-use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Test\ResetDatabase;
 use Zenstruck\Foundry\Tests\Fixture\Entity\Address;
 use Zenstruck\Foundry\Tests\Fixture\Entity\Category;
@@ -41,7 +40,6 @@
 #[AsInMemoryTest]
 final class InMemoryTest extends KernelTestCase
 {
-    use Factories;
     use RequiresORM;
     use ResetDatabase;
 
diff --git a/utils/rector/config/foundry-2.8.php b/utils/rector/config/foundry-2.8.php
@@ -15,7 +15,7 @@
 use Rector\Removing\Rector\Class_\RemoveTraitUseRector;
 use Zenstruck\Foundry\Test\Factories;
 
-return static function (RectorConfig $rectorConfig): void {
+return static function(RectorConfig $rectorConfig): void {
     $rectorConfig->ruleWithConfiguration(
         RemoveTraitUseRector::class,
         [

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ public function notify(Event\Test\PreparationStarted $event): void`
`33`	`33`	`return;`
`34`	`34`	`}`
`35`	`35`	`/** @var Event\Code\TestMethod $test */`
`36`		`-`
`37`	`36`	`$this->bootFoundry($test->className());`
`38`	`37`	`}`
`39`	`38`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ public function notify(Event\Test\Prepared $event): void`
`30`	`30`	`return;`
`31`	`31`	`}`
`32`	`32`	`/** @var Event\Code\TestMethod $test */`
`33`		`-`
`34`	`33`	`if (!$test->testData()->hasDataFromDataProvider() \|\| $test->metadata()->isDataProvider()->isEmpty()) {`
`35`	`34`	`return;`
`36`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`
`16`	`16`	`use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;`
`17`	`17`	`use Zenstruck\Foundry\Attribute\WithStory;`
`18`		`-use Zenstruck\Foundry\Test\Factories;`
`19`	`18`	`use Zenstruck\Foundry\Test\ResetDatabase;`
`20`	`19`	`use Zenstruck\Foundry\Tests\Fixture\Stories\EntityStory;`
`21`	`20`	`use Zenstruck\Foundry\Tests\Integration\RequiresORM;`
`@@ -26,5 +25,5 @@`
`26`	`25`	`#[WithStory(EntityStory::class)]`
`27`	`26`	`abstract class ParentClassWithStoryAttributeTestCase extends KernelTestCase`
`28`	`27`	`{`
`29`		`- use Factories, RequiresORM, ResetDatabase;`
	`28`	`+ use RequiresORM, ResetDatabase;`
`30`	`29`	`}`