feat: auto refresh with lazy object php84 enabled by config (#950)

nikophil · nikophil · commit fe6374be3c2e · 2025-08-28T18:43:54.000+02:00
bot: fix cs [skip ci]
diff --git a/.env b/.env
@@ -9,4 +9,5 @@ MONGO_URL="mongodb://127.0.0.1:27018/dbName?compressors=disabled&amp;gssapiServi
 
 USE_DAMA_DOCTRINE_TEST_BUNDLE="0"
 USE_FOUNDRY_PHPUNIT_EXTENSION="0"
+USE_PHP_84_LAZY_OBJECTS="0"
 PHPUNIT_VERSION="12" # allowed values: 9, 10, 11, 12
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,6 +17,7 @@ jobs:
         symfony: [ 6.4.*, 7.3.*, 8.0.*-dev ]
         database: [ mysql|mongo ]
         phpunit: [ 11, 12 ]
+        use-php-84-lazy-objects: [ 1 ]
 
         # default values:
         # deps: [ highest ]
@@ -55,11 +56,15 @@ jobs:
 
           # using Foundry's PHPUnit extension
           - {php: 8.4, symfony: '*', phpunit: 12, database: mysql|mongo, use-phpunit-extension: 1}
+
+          # disable lazy objects in PHP 8.4
+          - {php: 8.4, symfony: '*', phpunit: 12, database: mysql|mongo, use-php-84-lazy-objects: 0}
     env:
       DATABASE_URL: ${{ contains(matrix.database, 'mysql') && 'mysql://root:root@localhost:3306/foundry?serverVersion=5.7.42' || contains(matrix.database, 'pgsql') && 'postgresql://root:root@localhost:5432/foundry?serverVersion=15' || contains(matrix.database, 'sqlite') && 'sqlite:///%kernel.project_dir%/var/data.db' || '' }}
       MONGO_URL: ${{ contains(matrix.database, 'mongo') && 'mongodb://127.0.0.1:27017/dbName?compressors=disabled&amp;gssapiServiceName=mongodb' || '' }}
       USE_DAMA_DOCTRINE_TEST_BUNDLE: ${{ contains(matrix.database, 'sql') && 1 || 0 }}
       USE_FOUNDRY_PHPUNIT_EXTENSION: ${{ matrix.use-phpunit-extension || 0 }}
+      USE_PHP_84_LAZY_OBJECTS: ${{ matrix.use-php-84-lazy-objects }}
       PHPUNIT_VERSION: ${{ matrix.phpunit }}
     services:
       postgres:
diff --git a/config/services.php b/config/services.php
@@ -36,6 +36,7 @@
             '%env(default:zenstruck_foundry.faker.seed:int:FOUNDRY_FAKER_SEED)%',
             service('.zenstruck_foundry.in_memory.repository_registry'),
             service('.foundry.persistence.objects_tracker')->nullOnInvalid(),
+            param('zenstruck_foundry.enable_auto_refresh_with_lazy_objects'),
         ])
         ->public()
     ;
diff --git a/phpunit-deprecation-baseline.xml b/phpunit-deprecation-baseline.xml
@@ -4,7 +4,8 @@
         <line number="25" hash="c6af5d66288d0667e424978000f29571e4954b81">
             <issue><![CDATA[Since symfony/framework-bundle 6.4: Not setting the "framework.php_errors.log" config option is deprecated. It will default to "true" in 7.0.]]></issue>
             <issue><![CDATA[Since symfony/var-exporter 7.3: Generating lazy proxy for class "Zenstruck\Foundry\Tests\Integration\ForceFactoriesTraitUsage\SomeObject" is deprecated; leverage native lazy objects instead.]]></issue>
-            <issue><![CDATA[Since zenstruck/foundry 2.6: Proxy usage is deprecated in PHP 8.4. Use directly PersistentObjectFactory, Foundry now leverages the native PHP lazy system to auto-refresh objects.]]></issue>
+            <issue><![CDATA[Since zenstruck/foundry 2.7: Proxy usage is deprecated in PHP 8.4. Use directly PersistentObjectFactory, Foundry now leverages the native PHP lazy system to auto-refresh objects.]]></issue>
+            <issue><![CDATA[Since zenstruck/foundry 2.7: Not setting a value for "zenstruck_foundry.enable_auto_refresh_with_lazy_objects" is deprecated. This option will be forced to true in 3.0.]]></issue>
         </line>
     </file>
 </files>
diff --git a/src/Configuration.php b/src/Configuration.php
@@ -62,6 +62,7 @@ public function __construct(
         ?int $forcedFakerSeed = null,
         public readonly ?InMemoryRepositoryRegistry $inMemoryRepositoryRegistry = null,
         public readonly ?PersistedObjectsTracker $persistedObjectsTracker = null,
+        private readonly bool $enableAutoRefreshWithLazyObjects = false,
     ) {
         if (null === self::$instance) {
             $this->faker->seed(self::fakerSeed($forcedFakerSeed));
@@ -164,4 +165,9 @@ public function isInMemoryEnabled(): bool
     {
         return $this->inMemory;
     }
+
+    public static function autoRefreshWithLazyObjectsIsEnabled(): bool
+    {
+        return self::isBooted() && self::instance()->enableAutoRefreshWithLazyObjects;
+    }
 }
diff --git a/src/Persistence/PersistenceManager.php b/src/Persistence/PersistenceManager.php
@@ -157,7 +157,10 @@ public function refresh(object &$object, bool $force = false, bool $allowRefresh
             return $object->_refresh();
         }
 
-        if (\PHP_VERSION_ID >= 80400 && ($reflector = new \ReflectionClass($object))->isUninitializedLazyObject($object)) {
+        if (
+            \PHP_VERSION_ID >= 80400
+            && ($reflector = new \ReflectionClass($object))->isUninitializedLazyObject($object)
+        ) {
             /** @var T $object */
             $object = $reflector->initializeLazyObject($object);
         }
@@ -208,7 +211,10 @@ public function refresh(object &$object, bool $force = false, bool $allowRefresh
 
     public function isPersisted(object $object): bool
     {
-        if (\PHP_VERSION_ID >= 80400 && ($reflector = new \ReflectionClass($object))->isUninitializedLazyObject($object)) {
+        if (
+            \PHP_VERSION_ID >= 80400
+            && ($reflector = new \ReflectionClass($object))->isUninitializedLazyObject($object)
+        ) {
             /** @var object $object */
             $object = $reflector->initializeLazyObject($object);
         }
diff --git a/src/Persistence/PersistentObjectFactory.php b/src/Persistence/PersistentObjectFactory.php
@@ -231,7 +231,10 @@ public function create(callable|array $attributes = []): object
     {
         $configuration = Configuration::instance();
 
-        if ($configuration->inADataProvider() && \PHP_VERSION_ID >= 80400 && !$this instanceof PersistentProxyObjectFactory) {
+        if ($configuration->inADataProvider()
+            && Configuration::autoRefreshWithLazyObjectsIsEnabled()
+            && !$this instanceof PersistentProxyObjectFactory
+        ) {
             return ProxyGenerator::wrapFactoryNativeProxy($this, $attributes);
         }
 
@@ -487,7 +490,10 @@ static function(object $object, array $parameters, PersistentObjectFactory $fact
                         return;
                     }
 
-                    if (\PHP_VERSION_ID >= 80400 && !$factoryUsed instanceof PersistentProxyObjectFactory) {
+                    if (
+                        Configuration::autoRefreshWithLazyObjectsIsEnabled()
+                        && !$factoryUsed instanceof PersistentProxyObjectFactory
+                    ) {
                         Configuration::instance()->persistedObjectsTracker?->add($object);
                     }
 
diff --git a/src/Persistence/PersistentProxyObjectFactory.php b/src/Persistence/PersistentProxyObjectFactory.php
@@ -29,8 +29,8 @@ public function __construct()
         if (\PHP_VERSION_ID >= 80400) {
             trigger_deprecation(
                 'zenstruck/foundry',
-                '2.6',
-                'Proxy usage is deprecated in PHP 8.4. Use directly PersistentObjectFactory, Foundry now leverages the native PHP lazy system to auto-refresh objects.',
+                '2.7',
+                'Proxy usage is deprecated in PHP 8.4. Use directly PersistentObjectFactory, 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).',
             );
         }
     }
diff --git a/src/Persistence/ProxyGenerator.php b/src/Persistence/ProxyGenerator.php
@@ -106,7 +106,11 @@ public static function unwrap(mixed $what, bool $withAutoRefresh = true): mixed
             return $what->_real($withAutoRefresh); // @phpstan-ignore return.type
         }
 
-        if (\PHP_VERSION_ID >= 80400 && \is_object($what) && ($reflector = new \ReflectionClass($what))->isUninitializedLazyObject($what)) {
+        if (
+            \PHP_VERSION_ID >= 80400
+            && \is_object($what)
+            && ($reflector = new \ReflectionClass($what))->isUninitializedLazyObject($what)
+        ) {
             return $reflector->initializeLazyObject($what);
         }
 
diff --git a/src/Persistence/ProxyRepositoryDecorator.php b/src/Persistence/ProxyRepositoryDecorator.php
@@ -32,8 +32,8 @@ public function __construct(string $class, bool $inMemory = false)
         if (\PHP_VERSION_ID >= 80400) {
             trigger_deprecation(
                 'zenstruck/foundry',
-                '2.6',
-                'Proxy usage is deprecated in PHP 8.4. Use directly PersistentObjectFactory, Foundry now leverages the native PHP lazy system to auto-refresh objects.',
+                '2.7',
+                'Proxy usage is deprecated in PHP 8.4. Use directly PersistentObjectFactory, 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).',
             );
         }
 
diff --git a/src/Persistence/functions.php b/src/Persistence/functions.php
@@ -96,10 +96,10 @@ function persist(string $class, array|callable $attributes = []): object
  */
 function proxy(object $object): object
 {
-    if (\PHP_VERSION_ID >= 80400) {
+    if (Configuration::autoRefreshWithLazyObjectsIsEnabled()) {
         trigger_deprecation(
             'zenstruck/foundry',
-            '2.6',
+            '2.7',
             'Proxy usage is deprecated in PHP 8.4. Use directly PersistentObjectFactory, Foundry now leverages the native PHP lazy system to auto-refresh objects.',
         );
     }
@@ -154,10 +154,14 @@ function refresh_all(): void
 {
     $objectsTracker = Configuration::instance()->persistedObjectsTracker;
 
-    if (\PHP_VERSION_ID < 80400 || null === $objectsTracker) {
+    if (\PHP_VERSION_ID < 80400) {
         throw new \BadMethodCallException('Cannot use refresh_all() before PHP 8.4.');
     }
 
+    if (!Configuration::autoRefreshWithLazyObjectsIsEnabled() || null === $objectsTracker) {
+        throw new \BadMethodCallException('Cannot use refresh_all() if auto refresh with lazy objects is not enabled.');
+    }
+
     $objectsTracker->refresh();
 }
 
@@ -228,7 +232,11 @@ function assert_not_persisted(object $object, string $message = '{entity} is per
  */
 function initialize_proxy_object(mixed $what): void
 {
-    if (\PHP_VERSION_ID >= 80400 && \is_object($what) && ($reflector = new \ReflectionClass($what))->isUninitializedLazyObject($what)) {
+    if (
+        \PHP_VERSION_ID >= 80400
+        && \is_object($what)
+        && ($reflector = new \ReflectionClass($what))->isUninitializedLazyObject($what)
+    ) {
         $reflector->initializeLazyObject($what);
 
         return;
diff --git a/src/ZenstruckFoundryBundle.php b/src/ZenstruckFoundryBundle.php
@@ -51,6 +51,14 @@ public function configure(DefinitionConfigurator $definition): void
                     ->defaultNull()
                     ->setDeprecated('zenstruck/foundry', '2.0', 'Since 2.0 auto_refresh_proxies defaults to true and this configuration has no effect.')
                 ->end()
+                ->booleanNode('enable_auto_refresh_with_lazy_objects')
+                    ->info('Enable auto-refresh using PHP 8.4 lazy objects (cannot be enabled if PHP < 8.4).')
+                    ->defaultNull()
+                    ->validate()
+                        ->ifTrue(fn(?bool $enableAutoRefreshWithLazyObjects): bool => $enableAutoRefreshWithLazyObjects && \PHP_VERSION_ID < 80400)
+                        ->thenInvalid('Cannot enable auto-refresh with lazy objects if not using at least PHP 8.4.')
+                    ->end()
+                ->end()
                 ->arrayNode('faker')
                     ->addDefaultsIfNotSet()
                     ->info('Configure the faker used by your factories.')
@@ -228,7 +236,8 @@ public function loadExtension(array $config, ContainerConfigurator $configurator
         $this->configureMakers($configurator, $container, $config);
         $this->configurePersistence($container, $configurator, $config);
         $this->configureInMemory($configurator, $container);
-        $this->configureFixturesStory($configurator, $container);
+        $this->configureFixturesStory($container);
+        $this->configureAutoRefreshWithLazyObjects($container, $config['enable_auto_refresh_with_lazy_objects'] ?? null);
     }
 
     public function build(ContainerBuilder $container): void
@@ -389,7 +398,7 @@ private function configurePersistence(ContainerBuilder $container, ContainerConf
     /**
      * @param array<string, mixed> $ormConfig
      */
-    private function configureOrm(ContainerConfigurator $configurator, ContainerBuilder $container, $ormConfig): void
+    private function configureOrm(ContainerConfigurator $configurator, ContainerBuilder $container, array $ormConfig): void
     {
         $configurator->import('../config/orm.php');
 
@@ -430,7 +439,7 @@ private function configureInMemory(ContainerConfigurator $configurator, Containe
         $container->registerForAutoconfiguration(InMemoryRepository::class)->addTag('foundry.in_memory.repository');
     }
 
-    private function configureFixturesStory(ContainerConfigurator $configurator, ContainerBuilder $container): void
+    private function configureFixturesStory(ContainerBuilder $container): void
     {
         $container->registerAttributeForAutoconfiguration(
             AsFixture::class,
@@ -444,4 +453,15 @@ static function(ChildDefinition $definition, AsFixture $attribute, \ReflectionCl
             }
         );
     }
+
+    private function configureAutoRefreshWithLazyObjects(ContainerBuilder $container, ?bool $enableAutoRefreshWithLazyObjects): void
+    {
+        $container->setParameter('zenstruck_foundry.enable_auto_refresh_with_lazy_objects', $enableAutoRefreshWithLazyObjects ?? false);
+
+        if (null === $enableAutoRefreshWithLazyObjects && \PHP_VERSION_ID >= 80400) {
+            trigger_deprecation('zenstruck/foundry', '2.7', 'Not setting a value for "zenstruck_foundry.enable_auto_refresh_with_lazy_objects" is deprecated. This option will be forced to true in 3.0.');
+
+            $container->removeDefinition('.foundry.persistence.objects_tracker');
+        }
+    }
 }
diff --git a/tests/Fixture/FoundryTestKernel.php b/tests/Fixture/FoundryTestKernel.php
@@ -70,6 +70,11 @@ public static function usesDamaDoctrineTestBundle(): bool
         return (bool) \getenv('USE_DAMA_DOCTRINE_TEST_BUNDLE');
     }
 
+    public static function usePHP84LazyObjects(): bool
+    {
+        return \PHP_VERSION_ID >= 80400 && \getenv('USE_PHP_84_LAZY_OBJECTS');
+    }
+
     protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader): void
     {
         $frameworkConfiguration = [
diff --git a/tests/Fixture/TestKernel.php b/tests/Fixture/TestKernel.php
@@ -43,6 +43,7 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
 
         $c->loadFromExtension('zenstruck_foundry', [
             'persistence' => ['flush_once' => true],
+            'enable_auto_refresh_with_lazy_objects' => self::usePHP84LazyObjects(),
             'orm' => [
                 'reset' => [
                     'mode' => ResetDatabaseMode::SCHEMA,
diff --git a/tests/Fixture/config/enable_auto_refresh_with_lazy_objects.yaml b/tests/Fixture/config/enable_auto_refresh_with_lazy_objects.yaml
@@ -0,0 +1,2 @@
+zenstruck_foundry:
+    enable_auto_refresh_with_lazy_objects: true
diff --git a/tests/Integration/DataProvider/DataProviderWithPersistentFactoryAndPHP84InKernelTest.php b/tests/Integration/DataProvider/DataProviderWithPersistentFactoryAndPHP84InKernelTest.php
@@ -14,6 +14,7 @@
 namespace Zenstruck\Foundry\Tests\Integration\DataProvider;
 
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\RequiresEnvironmentVariable;
 use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\Attributes\RequiresPhpunit;
 use PHPUnit\Framework\Attributes\RequiresPhpunitExtension;
@@ -27,11 +28,12 @@
 
 /**
  * @author Nicolas PHILIPPE <nikophil@gmail.com>
- * @requires PHPUnit >=11.4
+ * @requires PHPUnit >=12
  */
-#[RequiresPhpunit('>=11.4')]
+#[RequiresPhpunit('>=12')]
 #[RequiresPhp('>=8.4')]
 #[RequiresPhpunitExtension(FoundryExtension::class)]
+#[RequiresEnvironmentVariable('USE_PHP_84_LAZY_OBJECTS', '1')]
 final class DataProviderWithPersistentFactoryAndPHP84InKernelTest extends KernelTestCase
 {
     use Factories;
diff --git a/tests/Integration/Persistence/ProxyPHP84TestCase.php b/tests/Integration/Persistence/ProxyPHP84TestCase.php
@@ -12,22 +12,32 @@
 namespace Zenstruck\Foundry\Tests\Integration\Persistence;
 
 use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\RequiresEnvironmentVariable;
 use PHPUnit\Framework\Attributes\RequiresPhp;
+use PHPUnit\Framework\Attributes\RequiresPhpunit;
 use PHPUnit\Framework\Attributes\Test;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\HttpKernel\KernelInterface;
 use Zenstruck\Foundry\Configuration;
 use Zenstruck\Foundry\Persistence\PersistentObjectFactory;
 use Zenstruck\Foundry\Persistence\Proxy\PersistedObjectsTracker;
 use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Test\ResetDatabase;
 use Zenstruck\Foundry\Tests\Fixture\Model\GenericModel;
+use Zenstruck\Foundry\Tests\Fixture\TestKernel;
 
 use function Zenstruck\Foundry\Persistence\assert_not_persisted;
 use function Zenstruck\Foundry\Persistence\assert_persisted;
 use function Zenstruck\Foundry\Persistence\refresh_all;
 
+/**
+ * @author Nicolas PHILIPPE <nikophil@gmail.com>
+ * @requires PHPUnit >=12
+ */
+#[RequiresPhpunit('>=12')]
+#[RequiresEnvironmentVariable('USE_PHP_84_LAZY_OBJECTS', '1')]
 abstract class ProxyPHP84TestCase extends WebTestCase
 {
     use Factories, ResetDatabase;
@@ -193,4 +203,9 @@ abstract protected static function factory(): PersistentObjectFactory;
     abstract protected function dbms(): string;
 
     abstract protected function updateObject(GenericModel $object): void;
+
+    protected static function createKernel(array $options = []): KernelInterface
+    {
+        return new TestKernel('enable_auto_refresh_with_lazy_objects', debug: true);
+    }
 }
diff --git a/tests/Unit/FactoryTest.php b/tests/Unit/FactoryTest.php
@@ -92,8 +92,10 @@ public function can_use_user_defined_proxy_persistent_factory_in_unit_test(): vo
 
     /**
      * @test
+     * @group legacy
      */
     #[Test]
+    #[IgnoreDeprecations]
     public function can_use_user_anonymous_proxy_persistent_factory_in_unit_test(): void
     {
         $object = proxy_factory(GenericEntity::class, ['prop1' => 'prop1'])->create();
@@ -149,8 +151,10 @@ public function instantiating_with_factory_attribute_instantiates_the_factory():
 
     /**
      * @test
+     * @group legacy
      */
     #[Test]
+    #[IgnoreDeprecations]
     public function instantiating_with_proxy_attribute_normalizes_to_underlying_object(): void
     {
         $object = ProxyContactFactory::createOne([
diff --git a/tests/Unit/ZenstruckFoundryBundleTest.php b/tests/Unit/ZenstruckFoundryBundleTest.php

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@`
`36`	`36`	`'%env(default:zenstruck_foundry.faker.seed:int:FOUNDRY_FAKER_SEED)%',`
`37`	`37`	`service('.zenstruck_foundry.in_memory.repository_registry'),`
`38`	`38`	`service('.foundry.persistence.objects_tracker')->nullOnInvalid(),`
	`39`	`+ param('zenstruck_foundry.enable_auto_refresh_with_lazy_objects'),`
`39`	`40`	`])`
`40`	`41`	`->public()`
`41`	`42`	`;`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ public function __construct(`
`62`	`62`	`?int $forcedFakerSeed = null,`
`63`	`63`	`public readonly ?InMemoryRepositoryRegistry $inMemoryRepositoryRegistry = null,`
`64`	`64`	`public readonly ?PersistedObjectsTracker $persistedObjectsTracker = null,`
	`65`	`+ private readonly bool $enableAutoRefreshWithLazyObjects = false,`
`65`	`66`	`) {`
`66`	`67`	`if (null === self::$instance) {`
`67`	`68`	`$this->faker->seed(self::fakerSeed($forcedFakerSeed));`
`@@ -164,4 +165,9 @@ public function isInMemoryEnabled(): bool`
`164`	`165`	`{`
`165`	`166`	`return $this->inMemory;`
`166`	`167`	`}`
	`168`	`+`
	`169`	`+ public static function autoRefreshWithLazyObjectsIsEnabled(): bool`
	`170`	`+ {`
	`171`	`+ return self::isBooted() && self::instance()->enableAutoRefreshWithLazyObjects;`
	`172`	`+ }`
`167`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,10 @@ public function refresh(object &$object, bool $force = false, bool $allowRefresh`
`157`	`157`	`return $object->_refresh();`
`158`	`158`	`}`
`159`	`159`
`160`		`- if (\PHP_VERSION_ID >= 80400 && ($reflector = new \ReflectionClass($object))->isUninitializedLazyObject($object)) {`
	`160`	`+ if (`
	`161`	`+ \PHP_VERSION_ID >= 80400`
	`162`	`+ && ($reflector = new \ReflectionClass($object))->isUninitializedLazyObject($object)`
	`163`	`+ ) {`
`161`	`164`	`/** @var T $object */`
`162`	`165`	`$object = $reflector->initializeLazyObject($object);`
`163`	`166`	`}`
`@@ -208,7 +211,10 @@ public function refresh(object &$object, bool $force = false, bool $allowRefresh`
`208`	`211`
`209`	`212`	`public function isPersisted(object $object): bool`
`210`	`213`	`{`
`211`		`- if (\PHP_VERSION_ID >= 80400 && ($reflector = new \ReflectionClass($object))->isUninitializedLazyObject($object)) {`
	`214`	`+ if (`
	`215`	`+ \PHP_VERSION_ID >= 80400`
	`216`	`+ && ($reflector = new \ReflectionClass($object))->isUninitializedLazyObject($object)`
	`217`	`+ ) {`
`212`	`218`	`/** @var object $object */`
`213`	`219`	`$object = $reflector->initializeLazyObject($object);`
`214`	`220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,10 @@ public function create(callable\|array $attributes = []): object`
`231`	`231`	`{`
`232`	`232`	`$configuration = Configuration::instance();`
`233`	`233`
`234`		`- if ($configuration->inADataProvider() && \PHP_VERSION_ID >= 80400 && !$this instanceof PersistentProxyObjectFactory) {`
	`234`	`+ if ($configuration->inADataProvider()`
	`235`	`+ && Configuration::autoRefreshWithLazyObjectsIsEnabled()`
	`236`	`+ && !$this instanceof PersistentProxyObjectFactory`
	`237`	`+ ) {`
`235`	`238`	`return ProxyGenerator::wrapFactoryNativeProxy($this, $attributes);`
`236`	`239`	`}`
`237`	`240`
`@@ -487,7 +490,10 @@ static function(object $object, array $parameters, PersistentObjectFactory $fact`
`487`	`490`	`return;`
`488`	`491`	`}`
`489`	`492`
`490`		`- if (\PHP_VERSION_ID >= 80400 && !$factoryUsed instanceof PersistentProxyObjectFactory) {`
	`493`	`+ if (`
	`494`	`+ Configuration::autoRefreshWithLazyObjectsIsEnabled()`
	`495`	`+ && !$factoryUsed instanceof PersistentProxyObjectFactory`
	`496`	`+ ) {`
`491`	`497`	`Configuration::instance()->persistedObjectsTracker?->add($object);`
`492`	`498`	`}`
`493`	`499`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ public function __construct()`
`29`	`29`	`if (\PHP_VERSION_ID >= 80400) {`
`30`	`30`	`trigger_deprecation(`
`31`	`31`	`'zenstruck/foundry',`
`32`		`- '2.6',`
`33`		`- 'Proxy usage is deprecated in PHP 8.4. Use directly PersistentObjectFactory, Foundry now leverages the native PHP lazy system to auto-refresh objects.',`
	`32`	`+ '2.7',`
	`33`	`+ 'Proxy usage is deprecated in PHP 8.4. Use directly PersistentObjectFactory, 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).',`
`34`	`34`	`);`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,11 @@ public static function unwrap(mixed $what, bool $withAutoRefresh = true): mixed`
`106`	`106`	`return $what->_real($withAutoRefresh); // @phpstan-ignore return.type`
`107`	`107`	`}`
`108`	`108`
`109`		`- if (\PHP_VERSION_ID >= 80400 && \is_object($what) && ($reflector = new \ReflectionClass($what))->isUninitializedLazyObject($what)) {`
	`109`	`+ if (`
	`110`	`+ \PHP_VERSION_ID >= 80400`
	`111`	`+ && \is_object($what)`
	`112`	`+ && ($reflector = new \ReflectionClass($what))->isUninitializedLazyObject($what)`
	`113`	`+ ) {`
`110`	`114`	`return $reflector->initializeLazyObject($what);`
`111`	`115`	`}`
`112`	`116`