fix: only use PersistedObjectsTracker when auto-refresh is enabled (#1013)

nikophil · web-flow · commit 7766a852cb29 · 2025-10-23T08:32:33.000+02:00
diff --git a/src/Configuration.php b/src/Configuration.php
@@ -140,6 +140,10 @@ public static function bootForDataProvider(\Closure|self $configuration): void
         self::$instance->bootedForDataProvider = true;
     }
 
+    /**
+     * /!\ Until PHPUnit 9 support is not dropped, this method MUST NOT call Configuration::instance()
+     * Otherwise, it will reboot the kernel, leading to complex bugs
+     */
     public static function shutdown(): void
     {
         PersistedObjectsTracker::reset();
diff --git a/src/Persistence/PersistenceManager.php b/src/Persistence/PersistenceManager.php
@@ -86,7 +86,9 @@ public function save(object $object): object
             $this->flush($om);
         }
 
-        PersistedObjectsTracker::updateIds();
+        if (Configuration::instance()->autoRefreshWithLazyObjectsIsEnabled()) {
+            Configuration::instance()->persistedObjectsTracker?->updateIds();
+        }
 
         return $object;
     }
@@ -426,7 +428,10 @@ private function flushAllStrategies(): void
                 $this->flush($om);
             }
         }
-        PersistedObjectsTracker::updateIds();
+
+        if (Configuration::instance()->autoRefreshWithLazyObjectsIsEnabled()) {
+            Configuration::instance()->persistedObjectsTracker?->updateIds();
+        }
     }
 
     /**
diff --git a/src/Persistence/Proxy/PersistedObjectsTracker.php b/src/Persistence/Proxy/PersistedObjectsTracker.php
@@ -48,7 +48,7 @@ public function add(object ...$objects): void
         }
     }
 
-    public static function updateIds(): void
+    public function updateIds(): void
     {
         foreach (self::$buffer as $object => $id) {
             if ($id) {
diff --git a/src/ZenstruckFoundryBundle.php b/src/ZenstruckFoundryBundle.php
@@ -460,7 +460,9 @@ private function configureAutoRefreshWithLazyObjects(ContainerBuilder $container
 
         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.');
+        }
 
+        if ($container->has('.foundry.persistence.objects_tracker') && !$enableAutoRefreshWithLazyObjects) {
             $container->removeDefinition('.foundry.persistence.objects_tracker');
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,10 @@ public static function bootForDataProvider(\Closure\|self $configuration): void`
`140`	`140`	`self::$instance->bootedForDataProvider = true;`
`141`	`141`	`}`
`142`	`142`
	`143`	`+ /**`
	`144`	`+ * /!\ Until PHPUnit 9 support is not dropped, this method MUST NOT call Configuration::instance()`
	`145`	`+ * Otherwise, it will reboot the kernel, leading to complex bugs`
	`146`	`+ */`
`143`	`147`	`public static function shutdown(): void`
`144`	`148`	`{`
`145`	`149`	`PersistedObjectsTracker::reset();`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,9 @@ public function save(object $object): object`
`86`	`86`	`$this->flush($om);`
`87`	`87`	`}`
`88`	`88`
`89`		`- PersistedObjectsTracker::updateIds();`
	`89`	`+ if (Configuration::instance()->autoRefreshWithLazyObjectsIsEnabled()) {`
	`90`	`+ Configuration::instance()->persistedObjectsTracker?->updateIds();`
	`91`	`+ }`
`90`	`92`
`91`	`93`	`return $object;`
`92`	`94`	`}`
`@@ -426,7 +428,10 @@ private function flushAllStrategies(): void`
`426`	`428`	`$this->flush($om);`
`427`	`429`	`}`
`428`	`430`	`}`
`429`		`- PersistedObjectsTracker::updateIds();`
	`431`	`+`
	`432`	`+ if (Configuration::instance()->autoRefreshWithLazyObjectsIsEnabled()) {`
	`433`	`+ Configuration::instance()->persistedObjectsTracker?->updateIds();`
	`434`	`+ }`
`430`	`435`	`}`
`431`	`436`
`432`	`437`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function add(object ...$objects): void`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- public static function updateIds(): void`
	`51`	`+ public function updateIds(): void`
`52`	`52`	`{`
`53`	`53`	`foreach (self::$buffer as $object => $id) {`
`54`	`54`	`if ($id) {`
Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,9 @@ private function configureAutoRefreshWithLazyObjects(ContainerBuilder $container`
`460`	`460`
`461`	`461`	`if (null === $enableAutoRefreshWithLazyObjects && \PHP_VERSION_ID >= 80400) {`
`462`	`462`	`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.');`
	`463`	`+ }`
`463`	`464`
	`465`	`+ if ($container->has('.foundry.persistence.objects_tracker') && !$enableAutoRefreshWithLazyObjects) {`
`464`	`466`	`$container->removeDefinition('.foundry.persistence.objects_tracker');`
`465`	`467`	`}`
`466`	`468`	`}`