Remove support for Doctrine Common proxies

Author: derrabus

.github/workflows/coding-standards.yml

@@ -13,5 +13,3 @@ jobs:
   coding-standards:
     name: "Coding Standards"
     uses: "doctrine/.github/.github/workflows/[email protected]"
-    with:
-      composer-root-version: "3.0"

.github/workflows/continuous-integration.yml

@@ -14,7 +14,6 @@ jobs:
     name: "PHPUnit"
     uses: "doctrine/.github/.github/workflows/[email protected]"
     with:
-      composer-root-version: "3.0"
       php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]'
     secrets:
       CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"

.github/workflows/static-analysis.yml

@@ -13,5 +13,3 @@ jobs:
   static-analysis:
     name: "Static Analysis"
     uses: "doctrine/.github/.github/workflows/[email protected]"
-    with:
-      composer-root-version: "3.0"

CONTRIBUTING.md

@@ -29,7 +29,6 @@
         "phpstan/phpstan-phpunit": "^1",
         "phpstan/phpstan-strict-rules": "^1.1",
         "doctrine/coding-standard": "^12",
-        "doctrine/common": "^3.0",
         "phpunit/phpunit": "^8.5 || ^9.5",
         "symfony/cache": "^4.4 || ^5.4 || ^6.0",
         "vimeo/psalm": "4.30.0 || 5.24.0"

composer.json

@@ -4,7 +4,6 @@
 
 namespace Doctrine\Persistence\Reflection;
 
-use Doctrine\Common\Proxy\Proxy as CommonProxy;
 use Doctrine\Persistence\Proxy;
 use ReflectionProperty;
 use ReturnTypeWillChange;
@@ -63,17 +62,6 @@ public function setValue($object, $value = null)
             return;
         }
 
-        if ($object instanceof CommonProxy) {
-            $originalInitializer = $object->__getInitializer();
-            $object->__setInitializer(null);
-
-            parent::setValue($object, $value);
-
-            $object->__setInitializer($originalInitializer);
-
-            return;
-        }
-
         if (! method_exists($object, '__setInitialized')) {
             return;
         }

src/Persistence/Reflection/RuntimeReflectionProperty.php

@@ -5,10 +5,8 @@
 namespace Doctrine\Tests\Persistence;
 
 use Closure;
-use Doctrine\Common\Proxy\Proxy as CommonProxy;
 use Doctrine\Persistence\Proxy;
 use Doctrine\Persistence\Reflection\RuntimeReflectionProperty;
-use LogicException;
 use PHPUnit\Framework\TestCase;
 
 class DummyMock
@@ -46,7 +44,6 @@ public function testGetSetValue(string $name, string $value): void
      * @param class-string<RuntimeReflectionPropertyTestProxyMock> $proxyClass
      *
      * @testWith ["Doctrine\\Tests\\Persistence\\RuntimeReflectionPropertyTestProxyMock"]
-     *           ["Doctrine\\Tests\\Persistence\\RuntimeReflectionPropertyTestCommonProxyMock"]
      *           ["\\Doctrine\\Tests\\Persistence\\RuntimeReflectionPropertyTestProxyMock"]
      */
     public function testGetValueOnProxyProperty(string $proxyClass): void
@@ -66,47 +63,23 @@ public function testGetValueOnProxyProperty(string $proxyClass): void
         self::assertNull($reflProperty->getValue($mockProxy));
     }
 
-    /**
-     * @param class-string<RuntimeReflectionPropertyTestProxyMock> $proxyClass
-     *
-     * @testWith ["Doctrine\\Tests\\Persistence\\RuntimeReflectionPropertyTestProxyMock"]
-     *           ["Doctrine\\Tests\\Persistence\\RuntimeReflectionPropertyTestCommonProxyMock"]
-     */
-    public function testSetValueOnProxyProperty(string $proxyClass): void
+    public function testSetValueOnProxyProperty(): void
     {
         $setCheckMock = $this->createMock(DummyMock::class);
         $setCheckMock->expects(self::never())->method('callSet');
         $initializer = static function () use ($setCheckMock): void {
             $setCheckMock->callSet();
         };
 
-        $mockProxy = new $proxyClass($initializer);
-
-        $reflProperty = new RuntimeReflectionProperty($proxyClass, 'checkedProperty');
+        $mockProxy    = new RuntimeReflectionPropertyTestProxyMock($initializer);
+        $reflProperty = new RuntimeReflectionProperty(RuntimeReflectionPropertyTestProxyMock::class, 'checkedProperty');
 
         $reflProperty->setValue($mockProxy, 'newValue');
         self::assertSame('newValue', $mockProxy->checkedProperty);
 
         unset($mockProxy->checkedProperty);
         $reflProperty->setValue($mockProxy, 'otherNewValue');
         self::assertSame('otherNewValue', $mockProxy->checkedProperty);
-
-        if (! $mockProxy instanceof CommonProxy) {
-            return;
-        }
-
-        $setCheckMock = $this->createMock(DummyMock::class);
-        $setCheckMock->expects(self::once())->method('callSet');
-        $initializer = static function () use ($setCheckMock): void {
-            $setCheckMock->callSet();
-        };
-
-        $mockProxy->__setInitializer($initializer);
-        $mockProxy->__setInitialized(true);
-
-        unset($mockProxy->checkedProperty);
-        $reflProperty->setValue($mockProxy, 'againNewValue');
-        self::assertSame('againNewValue', $mockProxy->checkedProperty);
     }
 }
 
@@ -180,66 +153,6 @@ public function __isset(string $name): bool
         return isset($this->checkedProperty);
     }
 }
-/**
- * Mock that simulates proxy property lazy loading
- *
- * @implements CommonProxy<object>
- */
-class RuntimeReflectionPropertyTestCommonProxyMock extends RuntimeReflectionPropertyTestProxyMock implements CommonProxy
-{
-    /** @param mixed $value */
-    public function __set(string $name, $value): void
-    {
-        if ($this->initializer !== null) {
-            ($this->initializer)();
-        }
-
-        $this->checkedProperty = $value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __getInitializer()
-    {
-        return $this->initializer;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __setInitializer(?Closure $initializer = null)
-    {
-        $this->initializer = $initializer;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return mixed[] Keys are the property names, and values are the default
-     *                 values for those properties.
-     * @phpstan-return array<string, mixed>
-     */
-    public function __getLazyProperties()
-    {
-        return [];
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __setCloner(?Closure $cloner = null)
-    {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __getCloner()
-    {
-        throw new LogicException('Not implemented');
-    }
-}
 
 class RuntimeReflectionPropertyTestClass
 {