Merge pull request #10999 from greg0ire/prepare-common-severance

doctrine · Oct 13, 2023 · 0e74a18 · 0e74a18
2 parents c5137da + fdfca0f
commit 0e74a18
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,10 @@
 # Upgrade to 2.17
 
+## Undeprecate `Doctrine\ORM\Proxy\Autoloader`
+
+It will be a full-fledged class, no longer extending
+`Doctrine\Common\Proxy\Autoloader` in 3.0.x.
+
 ## Deprecated: reliance on the non-optimal defaults that come with the `AUTO` identifier generation strategy
 
 When the `AUTO` identifier generation strategy was introduced, the best

diff --git a/docs/en/reference/advanced-configuration.rst b/docs/en/reference/advanced-configuration.rst
@@ -408,7 +408,7 @@ means that you have to register a special autoloader for these classes:
 .. code-block:: php
 
     <?php
-    use Doctrine\Common\Proxy\Autoloader;
+    use Doctrine\ORM\Proxy\Autoloader;
 
     $proxyDir = "/path/to/proxies";
     $proxyNamespace = "MyProxies";

diff --git a/lib/Doctrine/ORM/Proxy/Autoloader.php b/lib/Doctrine/ORM/Proxy/Autoloader.php
@@ -6,7 +6,6 @@
 
 use Doctrine\Common\Proxy\Autoloader as BaseAutoloader;
 
-/** @deprecated use \Doctrine\Common\Proxy\Autoloader instead */
 class Autoloader extends BaseAutoloader
 {
 }