Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: replace classutils with doctrine/orm version #1747

Merged
merged 1 commit into from
Jan 25, 2024
Merged

fix: replace classutils with doctrine/orm version #1747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions DoctrineBundle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\RemoveProfilerControllerPass;
use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\ServiceRepositoryCompilerPass;
use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\WellKnownSchemaFilterPass;
use Doctrine\Common\Util\ClassUtils;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Proxy\Autoloader;
use Doctrine\ORM\Proxy\DefaultProxyClassNameResolver;
use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\DoctrineValidationPass;
use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterEventListenersAndSubscribersPass;
use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterUidTypePass;
Expand Down Expand Up @@ -101,7 +101,7 @@
$container = &$this->container;

$proxyGenerator = static function ($proxyDir, $proxyNamespace, $class) use (&$container): void {
$originalClassName = ClassUtils::getRealClass($class);
$originalClassName = (new DefaultProxyClassNameResolver())->resolveClassName($class);

Check warning on line 104 in DoctrineBundle.php

View check run for this annotation

Codecov / codecov/patch

DoctrineBundle.php#L104 

Added line #L104 was not covered by tests
$registry = $container->get('doctrine');
assert($registry instanceof Registry);

Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"doctrine/annotations": "^1 || ^2",
"doctrine/coding-standard": "^12",
"doctrine/deprecations": "^1.0",
"doctrine/orm": "^2.14 || ^3.0",
"doctrine/orm": "^2.17 || ^3.0",
ostrolucky marked this conversation as resolved.
Show resolved Hide resolved
"friendsofphp/proxy-manager-lts": "^1.0",
"phpunit/phpunit": "^9.5.26",
"psalm/plugin-phpunit": "^0.18.4",
Expand All @@ -69,7 +69,7 @@
},
"conflict": {
"doctrine/annotations": ">=3.0",
"doctrine/orm": "<2.14 || >=4.0",
"doctrine/orm": "<2.17 || >=4.0",
"twig/twig": "<1.34 || >=2.0 <2.4"
},
"suggest": {
Expand Down