Merge pull request doctrine#12038 from doctrine/3.5.x

Merge 3.5.x up into 4.0.x

Author: greg0ire

src/Proxy/Autoloader.php

@@ -5,6 +5,7 @@
 namespace Doctrine\ORM\Proxy;
 
 use Closure;
+use Doctrine\Deprecations\Deprecation;
 
 use function file_exists;
 use function ltrim;
@@ -15,6 +16,7 @@
 use function substr;
 
 use const DIRECTORY_SEPARATOR;
+use const PHP_VERSION_ID;
 
 /**
  * Special Autoloader for Proxy classes, which are not PSR-0 compliant.
@@ -34,6 +36,15 @@ final class Autoloader
      */
     public static function resolveFile(string $proxyDir, string $proxyNamespace, string $className): string
     {
+        if (PHP_VERSION_ID >= 80400) {
+            Deprecation::trigger(
+                'doctrine/orm',
+                'https://github.com/doctrine/orm/pull/12005',
+                'Class "%s" is deprecated. Use native lazy objects instead.',
+                self::class,
+            );
+        }
+
         if (! str_starts_with($className, $proxyNamespace)) {
             throw new NotAProxyClass($className, $proxyNamespace);
         }
@@ -59,6 +70,15 @@ public static function register(
         string $proxyNamespace,
         Closure|null $notFoundCallback = null,
     ): Closure {
+        if (PHP_VERSION_ID >= 80400) {
+            Deprecation::trigger(
+                'doctrine/orm',
+                'https://github.com/doctrine/orm/pull/12005',
+                'Class "%s" is deprecated. Use native lazy objects instead.',
+                self::class,
+            );
+        }
+
         $proxyNamespace = ltrim($proxyNamespace, '\\');
 
         $autoloader = /** @param class-string $className */ static function (string $className) use ($proxyDir, $proxyNamespace, $notFoundCallback): void {

src/Proxy/DefaultProxyClassNameResolver.php

@@ -4,12 +4,15 @@
 
 namespace Doctrine\ORM\Proxy;
 
+use Doctrine\Deprecations\Deprecation;
 use Doctrine\Persistence\Mapping\ProxyClassNameResolver;
 use Doctrine\Persistence\Proxy;
 
 use function strrpos;
 use function substr;
 
+use const PHP_VERSION_ID;
+
 /**
  * Class-related functionality for objects that might or not be proxy objects
  * at the moment.
@@ -18,6 +21,15 @@ final class DefaultProxyClassNameResolver implements ProxyClassNameResolver
 {
     public function resolveClassName(string $className): string
     {
+        if (PHP_VERSION_ID >= 80400) {
+            Deprecation::triggerIfCalledFromOutside(
+                'doctrine/orm',
+                'https://github.com/doctrine/orm/pull/12005',
+                'Class "%s" is deprecated. Use native lazy objects instead.',
+                self::class,
+            );
+        }
+
         $pos = strrpos($className, '\\' . Proxy::MARKER . '\\');
 
         if ($pos === false) {
@@ -30,6 +42,15 @@ public function resolveClassName(string $className): string
     /** @return class-string */
     public static function getClass(object $object): string
     {
+        if (PHP_VERSION_ID >= 80400) {
+            Deprecation::triggerIfCalledFromOutside(
+                'doctrine/orm',
+                'https://github.com/doctrine/orm/pull/12005',
+                'Class "%s" is deprecated. Use native lazy objects instead.',
+                self::class,
+            );
+        }
+
         return (new self())->resolveClassName($object::class);
     }
 }

tests/Tests/Proxy/AutoloaderTest.php

@@ -6,6 +6,7 @@
 
 use Doctrine\ORM\Proxy\Autoloader;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use PHPUnit\Framework\TestCase;
 
 use function class_exists;
@@ -31,6 +32,7 @@ public static function dataResolveFile(): iterable
 
     /** @param class-string $className */
     #[DataProvider('dataResolveFile')]
+    #[WithoutErrorHandler]
     public function testResolveFile(
         string $proxyDir,
         string $proxyNamespace,
@@ -41,6 +43,7 @@ public function testResolveFile(
         self::assertEquals($expectedProxyFile, $actualProxyFile);
     }
 
+    #[WithoutErrorHandler]
     public function testAutoload(): void
     {
         if (file_exists(sys_get_temp_dir() . '/AutoloaderTestClass.php')) {