Skip to content

Commit 8a6ccdf

Browse files
Arend Hummelingostrolucky
authored andcommitted
fix: replace classutils with doctrine/orm version
1 parent d9be844 commit 8a6ccdf

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

DoctrineBundle.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\RemoveProfilerControllerPass;
1414
use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\ServiceRepositoryCompilerPass;
1515
use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\WellKnownSchemaFilterPass;
16-
use Doctrine\Common\Util\ClassUtils;
1716
use Doctrine\ORM\EntityManagerInterface;
1817
use Doctrine\ORM\Proxy\Autoloader;
18+
use Doctrine\ORM\Proxy\DefaultProxyClassNameResolver;
1919
use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\DoctrineValidationPass;
2020
use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterEventListenersAndSubscribersPass;
2121
use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterUidTypePass;
@@ -101,7 +101,7 @@ public function boot()
101101
$container = &$this->container;
102102

103103
$proxyGenerator = static function ($proxyDir, $proxyNamespace, $class) use (&$container): void {
104-
$originalClassName = ClassUtils::getRealClass($class);
104+
$originalClassName = (new DefaultProxyClassNameResolver())->resolveClassName($class);
105105
$registry = $container->get('doctrine');
106106
assert($registry instanceof Registry);
107107

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"doctrine/annotations": "^1 || ^2",
4949
"doctrine/coding-standard": "^12",
5050
"doctrine/deprecations": "^1.0",
51-
"doctrine/orm": "^2.14 || ^3.0",
51+
"doctrine/orm": "^2.17 || ^3.0",
5252
"friendsofphp/proxy-manager-lts": "^1.0",
5353
"phpunit/phpunit": "^9.5.26",
5454
"psalm/plugin-phpunit": "^0.18.4",
@@ -69,7 +69,7 @@
6969
},
7070
"conflict": {
7171
"doctrine/annotations": ">=3.0",
72-
"doctrine/orm": "<2.14 || >=4.0",
72+
"doctrine/orm": "<2.17 || >=4.0",
7373
"twig/twig": "<1.34 || >=2.0 <2.4"
7474
},
7575
"suggest": {

0 commit comments

Comments
 (0)