minor: add parameter "withAutoRefresh" to unproxy() function (#840)

Author: nikophil

src/Persistence/PersistentObjectFactory.php

@@ -296,11 +296,7 @@ protected function normalizeParameter(string $field, mixed $value): mixed
                 $inversedObject = $value->withPersistMode(PersistMode::NO_PERSIST_BUT_SCHEDULE_FOR_INSERT)
                     ->create([$inverseField => $placeholder = (new \ReflectionClass(static::class()))->newInstanceWithoutConstructor()]);
 
-                // auto-refresh computes changeset and prevents the placeholder object to be cleanly
-                // forgotten fom the persistence manager
-                if ($inversedObject instanceof Proxy) {
-                    $inversedObject = $inversedObject->_real(withAutoRefresh: false);
-                }
+                $inversedObject = unproxy($inversedObject, withAutoRefresh: false);
 
                 $this->tempAfterInstantiate[] = static function(object $object) use ($inversedObject, $inverseField, $pm, $placeholder) {
                     $pm->forget($placeholder);
@@ -311,7 +307,7 @@ protected function normalizeParameter(string $field, mixed $value): mixed
             }
         }
 
-        return unproxy(parent::normalizeParameter($field, $value));
+        return unproxy(parent::normalizeParameter($field, $value), withAutoRefresh: false);
     }
 
     protected function normalizeCollection(string $field, FactoryCollection $collection): array
@@ -330,7 +326,7 @@ protected function normalizeCollection(string $field, FactoryCollection $collect
 
                 $inverseObjects = $collection->withPersistMode(PersistMode::NO_PERSIST_BUT_SCHEDULE_FOR_INSERT)->create([$inverseField => $object]);
 
-                $inverseObjects = unproxy($inverseObjects);
+                $inverseObjects = unproxy($inverseObjects, withAutoRefresh: false);
 
                 // if the collection is indexed by a field, index the array
                 if ($inverseRelationshipMetadata->collectionIndexedBy) {
@@ -366,9 +362,7 @@ protected function normalizeObject(object $object): object
             return $object;
         }
 
-        if ($object instanceof Proxy) {
-            $object = $object->_real(withAutoRefresh: false);
-        }
+        $object = unproxy($object, withAutoRefresh: false);
 
         $persistenceManager = $configuration->persistence();
         if (!$persistenceManager->hasPersistenceFor($object)) {

src/Persistence/ProxyGenerator.php

@@ -66,18 +66,18 @@ public static function wrapFactory(PersistentProxyObjectFactory $factory, callab
      *
      * @return T
      */
-    public static function unwrap(mixed $what): mixed
+    public static function unwrap(mixed $what, bool $withAutoRefresh = true): mixed
     {
         if (\is_array($what)) {
-            return \array_map(self::unwrap(...), $what); // @phpstan-ignore return.type
+            return \array_map(static fn(mixed $w) => self::unwrap($w, $withAutoRefresh), $what); // @phpstan-ignore return.type
         }
 
         if (\is_string($what) && \is_a($what, Proxy::class, true)) {
             return \get_parent_class($what) ?: throw new \LogicException('Could not unwrap proxy.'); // @phpstan-ignore return.type
         }
 
         if ($what instanceof Proxy) {
-            return $what->_real(); // @phpstan-ignore return.type
+            return $what->_real($withAutoRefresh); // @phpstan-ignore return.type
         }
 
         return $what;

src/Persistence/functions.php

@@ -107,9 +107,9 @@ function proxy(object $object): object
  *
  * @return T
  */
-function unproxy(mixed $what): mixed
+function unproxy(mixed $what, bool $withAutoRefresh = true): mixed
 {
-    return ProxyGenerator::unwrap($what);
+    return ProxyGenerator::unwrap($what, $withAutoRefresh);
 }
 
 /**