refactor(bc layer): introduce Proxy interface

zenstruck · Nov 29, 2023 · 2e91ad6 · 2e91ad6
1 parent 73cd6a9
commit 2e91ad6
Show file tree

Hide file tree

Showing 10 changed files with 452 additions and 424 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -71,7 +71,12 @@ parameters:
 			path: src/Persistence/RepositoryDecorator.php
 
 		-
-			message: "#^If condition is always false\\.$#"
+			message: "#^Method Zenstruck\\\\Foundry\\\\Persistence\\\\RepositoryDecorator\\:\\:proxyResult\\(\\) should return array\\<int, Zenstruck\\\\Foundry\\\\Persistence\\\\Proxy\\<TProxiedObject of object\\>\\>\\|Zenstruck\\\\Foundry\\\\Persistence\\\\Proxy\\<TProxiedObject of object\\> but returns Zenstruck\\\\Foundry\\\\Proxy\\.$#"
+			count: 1
+			path: src/Persistence/RepositoryDecorator.php
+
+		-
+			message: "#^PHPDoc tag @return with type Zenstruck\\\\Foundry\\\\Persistence\\\\Proxy\\<TObject of object\\> is not subtype of native type Zenstruck\\\\Foundry\\\\Proxy\\.$#"
 			count: 1
 			path: src/Proxy.php
 

diff --git a/src/Factory.php b/src/Factory.php
@@ -20,6 +20,7 @@
 use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
 use Zenstruck\Foundry\Persistence\PostPersistCallback;
 use Zenstruck\Foundry\Persistence\Proxy;
+use Zenstruck\Foundry\Proxy as ProxyObject;
 
 /**
  * @template TObject of object
@@ -156,17 +157,17 @@ public function create(
         }
 
         if (!$this->isPersisting()) {
-            return $noProxy ? $object : new Proxy($object);
+            return $noProxy ? $object : new ProxyObject($object);
         }
 
-        $proxy = new Proxy($object);
+        $proxy = new ProxyObject($object);
 
         if ($this->cascadePersist && !$postPersistCallbacks) {
             return $proxy;
         }
 
         $proxy->_save()
-            ->_withoutAutoRefresh(function(Proxy $proxy) use ($attributes, $postPersistCallbacks): void {
+            ->_withoutAutoRefresh(function(ProxyObject $proxy) use ($attributes, $postPersistCallbacks): void {
                 $callbacks = [...$postPersistCallbacks, ...$this->afterPersist];
 
                 if (!$callbacks) {
@@ -417,7 +418,7 @@ private function normalizeAttributes(array|callable $attributes): array
 
     private function normalizeAttribute(mixed $value, string $name): mixed
     {
-        if ($value instanceof Proxy) {
+        if ($value instanceof ProxyObject) {
             return $value->isPersisted(calledInternally: true) ? $value->_refresh()->_real() : $value->_real();
         }
 
@@ -489,7 +490,7 @@ private static function normalizeObject(object $object): object
         }
 
         try {
-            return Proxy::createFromPersisted($object)->_refresh()->_real();
+            return ProxyObject::createFromPersisted($object)->_refresh()->_real();
         } catch (\RuntimeException) {
             return $object;
         }